diff options
author | Vu Tran <vu.tran@windriver.com> | 2014-05-28 12:37:00 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-30 10:57:33 -0400 |
commit | d2edcf32203949ad4d5b53ca638c7bfa35867d20 (patch) | |
tree | 5bc5d934730ff800e23f3cf3350bddc8bc0cc592 /meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |
parent | 96ad965cc70b57d520adca5a120e699c0deaabd9 (diff) | |
download | meta-cloud-services-d2edcf32203949ad4d5b53ca638c7bfa35867d20.tar.gz |
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>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-ceilometer_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | 14 |
1 files changed, 12 insertions, 2 deletions
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() { | |||
69 | 69 | ||
70 | sed 's:@suffix@:alarm-evaluator:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-alarm-evaluator.init.sh | 70 | sed 's:@suffix@:alarm-evaluator:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-alarm-evaluator.init.sh |
71 | install -m 0755 ${WORKDIR}/ceilometer-alarm-evaluator.init.sh ${D}${sysconfdir}/init.d/ceilometer-alarm-evaluator | 71 | install -m 0755 ${WORKDIR}/ceilometer-alarm-evaluator.init.sh ${D}${sysconfdir}/init.d/ceilometer-alarm-evaluator |
72 | |||
73 | sed 's:@suffix@:agent-notification:' < ${WORKDIR}/ceilometer.init >${WORKDIR}/ceilometer-agent-notification.init.sh | ||
74 | install -m 0755 ${WORKDIR}/ceilometer-agent-notification.init.sh ${D}${sysconfdir}/init.d/ceilometer-agent-notification | ||
72 | fi | 75 | fi |
73 | 76 | ||
74 | cp setup-test-env.sh ${CEILOMETER_CONF_DIR} | 77 | cp setup-test-env.sh ${CEILOMETER_CONF_DIR} |
@@ -96,6 +99,7 @@ inherit setuptools identity hosts update-rc.d default_configs | |||
96 | PACKAGES += " ${SRCNAME}-tests" | 99 | PACKAGES += " ${SRCNAME}-tests" |
97 | PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" | 100 | PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" |
98 | PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator" | 101 | PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator" |
102 | PACKAGES += "${SRCNAME}-agent-notification" | ||
99 | PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" | 103 | PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" |
100 | 104 | ||
101 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 105 | ALLOW_EMPTY_${SRCNAME}-setup = "1" |
@@ -123,6 +127,10 @@ FILES_${SRCNAME}-alarm-notifier = "${bindir}/ceilometer-alarm-notifier \ | |||
123 | ${sysconfdir}/init.d/ceilometer-alarm-notifier \ | 127 | ${sysconfdir}/init.d/ceilometer-alarm-notifier \ |
124 | " | 128 | " |
125 | 129 | ||
130 | FILES_${SRCNAME}-agent-notification = "${bindir}/ceilometer-agent-notification \ | ||
131 | ${sysconfdir}/init.d/ceilometer-agent-notification \ | ||
132 | " | ||
133 | |||
126 | FILES_${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \ | 134 | FILES_${SRCNAME}-compute = "${bindir}/ceilometer-agent-compute \ |
127 | ${sysconfdir}/init.d/ceilometer-agent-compute \ | 135 | ${sysconfdir}/init.d/ceilometer-agent-compute \ |
128 | " | 136 | " |
@@ -187,7 +195,7 @@ RDEPENDS_${PN} += " \ | |||
187 | python-ipaddr \ | 195 | python-ipaddr \ |
188 | " | 196 | " |
189 | 197 | ||
190 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator \ | 198 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification \ |
191 | postgresql postgresql-client python-psycopg2 tgt" | 199 | postgresql postgresql-client python-psycopg2 tgt" |
192 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller" | 200 | RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller" |
193 | RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller" | 201 | RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller" |
@@ -195,7 +203,7 @@ RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient l | |||
195 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" | 203 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" |
196 | 204 | ||
197 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" | 205 | INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" |
198 | INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator" | 206 | INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification" |
199 | INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" | 207 | INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" |
200 | INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 208 | INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
201 | INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector" | 209 | INITSCRIPT_NAME_${SRCNAME}-collector = "${SRCNAME}-collector" |
@@ -208,3 +216,5 @@ INITSCRIPT_NAME_${SRCNAME}-alarm-notifier = "${SRCNAME}-alarm-notifier" | |||
208 | INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 216 | INITSCRIPT_PARAMS_${SRCNAME}-alarm-notifier = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
209 | INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator" | 217 | INITSCRIPT_NAME_${SRCNAME}-alarm-evaluator = "${SRCNAME}-alarm-evaluator" |
210 | INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 218 | INITSCRIPT_PARAMS_${SRCNAME}-alarm-evaluator = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
219 | INITSCRIPT_NAME_${SRCNAME}-agent-notification = "${SRCNAME}-agent-notification" | ||
220 | INITSCRIPT_PARAMS_${SRCNAME}-agent-notification = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | ||