summaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-07-21 16:35:11 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-21 16:35:11 -0400
commit524149970dc8af8cf5d6427c72dcb688eacaed62 (patch)
tree4ec16d501e1ad159cec8cc19a82ce421b951fe71 /meta-openstack
parent8b29cb4a3b24905848ffae7b3d3d4955e8243167 (diff)
downloadmeta-cloud-services-524149970dc8af8cf5d6427c72dcb688eacaed62.tar.gz
ceilometer: package and deploy api_paste.ini
Ceilometer now requires api_paste.ini for the API to start and be functionaly. So we add it to our core package, and update the .conf file with the name. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf2
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
index 6340a15..db78580 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
@@ -4,6 +4,8 @@
4# Options defined in ceilometer.middleware 4# Options defined in ceilometer.middleware
5# 5#
6 6
7api_paste_config=/etc/ceilometer/api_paste.ini
8
7# Exchanges name to listen for notifications (multi valued) 9# Exchanges name to listen for notifications (multi valued)
8#http_control_exchanges=nova 10#http_control_exchanges=nova
9#http_control_exchanges=glance 11#http_control_exchanges=glance
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 4c94300..1e6e200 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -35,6 +35,8 @@ do_install_append() {
35 install -m 600 ${TEMPLATE_CONF_DIR}/*.json ${CEILOMETER_CONF_DIR} 35 install -m 600 ${TEMPLATE_CONF_DIR}/*.json ${CEILOMETER_CONF_DIR}
36 install -m 600 ${TEMPLATE_CONF_DIR}/*.yaml ${CEILOMETER_CONF_DIR} 36 install -m 600 ${TEMPLATE_CONF_DIR}/*.yaml ${CEILOMETER_CONF_DIR}
37 37
38 install -m 600 ${TEMPLATE_CONF_DIR}/api_paste.ini ${CEILOMETER_CONF_DIR}
39
38 sed -e "s:%CEILOMETER_SECRET%:${CEILOMETER_SECRET}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf 40 sed -e "s:%CEILOMETER_SECRET%:${CEILOMETER_SECRET}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf
39 41
40 sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf 42 sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf