diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-01-09 10:04:10 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-01-09 12:23:58 -0500 |
commit | 0d6067258d09fdd47c95828e5e0e9b0f9987a529 (patch) | |
tree | dbce7395b11e577bbcd633fa0daeae24697df42e /meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |
parent | 96dd0da3edc2f56de99d84ef96effdbf366a3041 (diff) | |
download | meta-cloud-services-0d6067258d09fdd47c95828e5e0e9b0f9987a529.tar.gz |
chef: remove the use of chef
The use of chef was never complete, had isses with updating binary
database files and had a cumbersome implementation. Since we are using
Ansible in meta-overc we are dropping the use of chef here and will
look to being at par with meta-overc by using Ansible if/when we get
time to look at runtime configuration in meta-cloud-services.
Signed-off-by: Mark Asselstine <mark.asselstine@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 | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 0d6e2d3..5645626 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |||
@@ -63,21 +63,20 @@ do_install_append() { | |||
63 | install -m 600 ${TEMPLATE_CONF_DIR}/*.yaml ${CEILOMETER_CONF_DIR} | 63 | install -m 600 ${TEMPLATE_CONF_DIR}/*.yaml ${CEILOMETER_CONF_DIR} |
64 | 64 | ||
65 | install -m 600 ${TEMPLATE_CONF_DIR}/api_paste.ini ${CEILOMETER_CONF_DIR} | 65 | install -m 600 ${TEMPLATE_CONF_DIR}/api_paste.ini ${CEILOMETER_CONF_DIR} |
66 | if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then | 66 | sed -e "s:%CEILOMETER_SECRET%:${CEILOMETER_SECRET}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
67 | sed -e "s:%CEILOMETER_SECRET%:${CEILOMETER_SECRET}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | ||
68 | 67 | ||
69 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 68 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
70 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 69 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
71 | 70 | ||
72 | sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 71 | sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
73 | sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 72 | sed -e "s:%CONTROLLER_HOST%:${CONTROLLER_HOST}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
74 | 73 | ||
75 | sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 74 | sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
76 | sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | 75 | sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf |
76 | |||
77 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | ||
78 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | ||
77 | 79 | ||
78 | sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | ||
79 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${CEILOMETER_CONF_DIR}/ceilometer.conf | ||
80 | fi | ||
81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 80 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
82 | install -d ${D}${sysconfdir}/init.d | 81 | install -d ${D}${sysconfdir}/init.d |
83 | 82 | ||
@@ -108,9 +107,6 @@ do_install_append() { | |||
108 | fi | 107 | fi |
109 | } | 108 | } |
110 | 109 | ||
111 | CHEF_SERVICES_CONF_FILES :="\ | ||
112 | ${sysconfdir}/${SRCNAME}/ceilometer.conf \ | ||
113 | " | ||
114 | pkg_postinst_${SRCNAME}-setup () { | 110 | pkg_postinst_${SRCNAME}-setup () { |
115 | if [ "x$D" != "x" ]; then | 111 | if [ "x$D" != "x" ]; then |
116 | exit 1 | 112 | exit 1 |
@@ -128,7 +124,7 @@ pkg_postinst_${SRCNAME}-setup () { | |||
128 | ceilometer-dbsync | 124 | ceilometer-dbsync |
129 | } | 125 | } |
130 | 126 | ||
131 | inherit setuptools identity hosts update-rc.d default_configs openstackchef monitor | 127 | inherit setuptools identity hosts update-rc.d default_configs monitor |
132 | 128 | ||
133 | PACKAGES += " ${SRCNAME}-tests" | 129 | PACKAGES += " ${SRCNAME}-tests" |
134 | PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" | 130 | PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api" |