From d2edcf32203949ad4d5b53ca638c7bfa35867d20 Mon Sep 17 00:00:00 2001
From: Vu Tran <vu.tran@windriver.com>
Date: Wed, 28 May 2014 12:37:00 -0400
Subject: ceilometer: need to start ceilometer agent notification

There are some missing ceilometer meters (e.g. vcpu) which have
origin from notification.  This is due to ceilometer-agent-notification
service is not started on controller node.

Signed-off-by: Vu Tran <vu.tran@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-ceilometer_git.bb       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'meta-openstack/recipes-devtools/python/python-ceilometer_git.bb')

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 9a55a71..85fe948 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -69,6 +69,9 @@ do_install_append() {
 
         sed 's:@suffix@:alarm-evaluator:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-alarm-evaluator.init.sh
         install -m 0755 ${WORKDIR}/ceilometer-alarm-evaluator.init.sh ${D}${sysconfdir}/init.d/ceilometer-alarm-evaluator
+
+        sed 's:@suffix@:agent-notification:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-agent-notification.init.sh
+        install -m 0755 ${WORKDIR}/ceilometer-agent-notification.init.sh ${D}${sysconfdir}/init.d/ceilometer-agent-notification
     fi
 
     cp setup-test-env.sh ${CEILOMETER_CONF_DIR}
@@ -96,6 +99,7 @@ inherit setuptools identity hosts update-rc.d default_configs
 PACKAGES += " ${SRCNAME}-tests"
 PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api"
 PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator"
+PACKAGES += "${SRCNAME}-agent-notification"
 PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
 
 ALLOW_EMPTY_${SRCNAME}-setup = "1"
@@ -123,6 +127,10 @@ FILES_${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \
                                    ${sysconfdir}/init.d/ceilometer-alarm-notifier \
 "
 
+FILES_${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \
+                                       ${sysconfdir}/init.d/ceilometer-agent-notification \
+"
+
 FILES_${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \
                             ${sysconfdir}/init.d/ceilometer-agent-compute \
 "
@@ -187,7 +195,7 @@ RDEPENDS_${PN} += " \
 	python-ipaddr \
 	"
 
-RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator \
+RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification \
                                   postgresql postgresql-client python-psycopg2 tgt"
 RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller"
 RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller"
@@ -195,7 +203,7 @@ RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient l
 RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller"
 
 INITSCRIPT_PACKAGES =  "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
-INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator"
+INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification"
 INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api"
 INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector"
@@ -208,3 +216,5 @@ INITSCRIPT_NAME_${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier"
 INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator"
 INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+INITSCRIPT_NAME_${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification"
+INITSCRIPT_PARAMS_${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-- 
cgit v1.2.3-54-g00ecf