add monitoring packagegroup into openstack build

Include monitoring packagegroups into various openstack
packagegroups.

Monitoring feature can be turned on by including the following
in local.conf

OPENSTACK_EXTRA_FEATURES += "monitoring"

There are various different system monitoring recipes
(e.g. Nagios or Monasca) provide packagegroup-monitoring-xxxxx.
To choose what system monitoring to use set the following in
local.conf

PREFERRED_PROVIDER_virtual/monitoring = "packagegroup-nagios-monitoring"

Signed-off-by: Vu Tran <vu.tran@windriver.com>

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} = " \
     fuse \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \
+    ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \
     "
 
 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 \
     fuse \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd libsasl2-modules pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \
+    ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \
     "
 
 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 @@
+DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+inherit packagegroup
+
+SRCNAME = "packagegroup-monitoring"
+
+PROVIDES = "virtual/monitoring"
+
+PACKAGES = "\
+        ${SRCNAME}-core \
+        ${SRCNAME}-agent \
+"
+
+RDEPENDS_${SRCNAME}-core += "\
+"
+
+RDEPENDS_${SRCNAME}-agent += "\
+"