diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-cinder_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-cinder_git.bb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 91098c4..e70a3aa 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
@@ -24,7 +24,7 @@ SRCREV = "61026d4e4f2a58dd84ffb2e4e40ab99860b9316a" | |||
24 | PV = "7.0.0+git${SRCPV}" | 24 | PV = "7.0.0+git${SRCPV}" |
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
27 | inherit setuptools update-rc.d identity default_configs hosts openstackchef monitor | 27 | inherit setuptools update-rc.d identity default_configs hosts monitor |
28 | 28 | ||
29 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" | 29 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" |
30 | 30 | ||
@@ -77,8 +77,7 @@ do_install_append() { | |||
77 | 77 | ||
78 | install -d ${D}${localstatedir}/log/${SRCNAME} | 78 | install -d ${D}${localstatedir}/log/${SRCNAME} |
79 | 79 | ||
80 | if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then | 80 | for file in api-paste.ini cinder.conf; do |
81 | for file in api-paste.ini cinder.conf; do | ||
82 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ | 81 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ |
83 | -i ${CINDER_CONF_DIR}/$file | 82 | -i ${CINDER_CONF_DIR}/$file |
84 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${CINDER_CONF_DIR}/$file | 83 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${CINDER_CONF_DIR}/$file |
@@ -89,8 +88,7 @@ do_install_append() { | |||
89 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${CINDER_CONF_DIR}/$file | 88 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${CINDER_CONF_DIR}/$file |
90 | sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" \ | 89 | sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" \ |
91 | -i ${CINDER_CONF_DIR}/$file | 90 | -i ${CINDER_CONF_DIR}/$file |
92 | done | 91 | done |
93 | fi | ||
94 | 92 | ||
95 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 93 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
96 | install -d ${D}${sysconfdir}/init.d | 94 | install -d ${D}${sysconfdir}/init.d |
@@ -125,10 +123,6 @@ do_install_append() { | |||
125 | sed -e "s:%IS_DEFAULT%:${is_default}:g" -i ${D}/etc/cinder/drivers/glusterfs_setup.sh | 123 | sed -e "s:%IS_DEFAULT%:${is_default}:g" -i ${D}/etc/cinder/drivers/glusterfs_setup.sh |
126 | } | 124 | } |
127 | 125 | ||
128 | CHEF_SERVICES_CONF_FILES :="\ | ||
129 | ${sysconfdir}/${SRCNAME}/cinder.conf \ | ||
130 | ${sysconfdir}/${SRCNAME}/api-paste.ini \ | ||
131 | " | ||
132 | pkg_postinst_${SRCNAME}-setup () { | 126 | pkg_postinst_${SRCNAME}-setup () { |
133 | if [ "x$D" != "x" ]; then | 127 | if [ "x$D" != "x" ]; then |
134 | exit 1 | 128 | exit 1 |