diff options
3 files changed, 23 insertions, 1 deletions
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index 6d107d7..2769e02 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | |||
@@ -26,6 +26,7 @@ RDEPENDS_${PN} = " \ | |||
26 | fuse \ | 26 | fuse \ |
27 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ | 27 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ |
28 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \ | 28 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \ |
29 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | RRECOMMENDS_${PN} = " \ | 32 | RRECOMMENDS_${PN} = " \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index ad737e4..706d3ec 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb | |||
@@ -53,7 +53,8 @@ RDEPENDS_${PN} = " postgresql-setup \ | |||
53 | fuse \ | 53 | fuse \ |
54 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ | 54 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ |
55 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \ | 55 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \ |
56 | ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd libsasl2-modules pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ | 56 | ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ |
57 | ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \ | ||
57 | " | 58 | " |
58 | 59 | ||
59 | RRECOMMENDS_${PN} = " \ | 60 | RRECOMMENDS_${PN} = " \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb new file mode 100644 index 0000000..4bf657b --- /dev/null +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||
4 | |||
5 | inherit packagegroup | ||
6 | |||
7 | SRCNAME = "packagegroup-monitoring" | ||
8 | |||
9 | PROVIDES = "virtual/monitoring" | ||
10 | |||
11 | PACKAGES = "\ | ||
12 | ${SRCNAME}-core \ | ||
13 | ${SRCNAME}-agent \ | ||
14 | " | ||
15 | |||
16 | RDEPENDS_${SRCNAME}-core += "\ | ||
17 | " | ||
18 | |||
19 | RDEPENDS_${SRCNAME}-agent += "\ | ||
20 | " | ||