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 | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 5abf4bc..ef66656 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="58eda5d1f41082a7e1ffef66239be30b8ac1321a" | |||
24 | PV="2014.2.b3+git${SRCPV}" | 24 | PV="2014.2.b3+git${SRCPV}" |
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
27 | inherit setuptools update-rc.d identity default_configs hosts | 27 | inherit setuptools update-rc.d identity default_configs hosts openstackchef |
28 | 28 | ||
29 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" | 29 | CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" |
30 | 30 | ||
@@ -61,23 +61,12 @@ CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}" | |||
61 | do_install_append() { | 61 | do_install_append() { |
62 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} | 62 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} |
63 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} | 63 | CINDER_CONF_DIR=${D}${sysconfdir}/${SRCNAME} |
64 | 64 | ||
65 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ | 65 | #Instead of substituting api-paste.ini from the WORKDIR, |
66 | ${TEMPLATE_CONF_DIR}/api-paste.ini > ${WORKDIR}/api-paste.ini | 66 | #move it over to the image's directory and do the substitution there |
67 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/api-paste.ini | ||
68 | sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \ | ||
69 | -i ${WORKDIR}/api-paste.ini | ||
70 | |||
71 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/cinder.conf | ||
72 | sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/cinder.conf | ||
73 | sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" -i ${WORKDIR}/cinder.conf | ||
74 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${WORKDIR}/cinder.conf | ||
75 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/cinder.conf | ||
76 | sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" -i ${WORKDIR}/cinder.conf | ||
77 | |||
78 | install -d ${CINDER_CONF_DIR} | 67 | install -d ${CINDER_CONF_DIR} |
79 | install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/ | 68 | install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/ |
80 | install -m 600 ${WORKDIR}/api-paste.ini ${CINDER_CONF_DIR}/ | 69 | install -m 600 ${TEMPLATE_CONF_DIR}/api-paste.ini ${CINDER_CONF_DIR}/ |
81 | install -m 600 ${S}/etc/cinder/policy.json ${CINDER_CONF_DIR}/ | 70 | install -m 600 ${S}/etc/cinder/policy.json ${CINDER_CONF_DIR}/ |
82 | 71 | ||
83 | install -d ${CINDER_CONF_DIR}/drivers | 72 | install -d ${CINDER_CONF_DIR}/drivers |
@@ -87,6 +76,21 @@ do_install_append() { | |||
87 | install -m 700 ${WORKDIR}/add-cinder-volume-types.sh ${CINDER_CONF_DIR}/ | 76 | install -m 700 ${WORKDIR}/add-cinder-volume-types.sh ${CINDER_CONF_DIR}/ |
88 | 77 | ||
89 | install -d ${D}${localstatedir}/log/${SRCNAME} | 78 | install -d ${D}${localstatedir}/log/${SRCNAME} |
79 | |||
80 | if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then | ||
81 | for file in api-paste.ini cinder.conf; do | ||
82 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ | ||
83 | -i ${CINDER_CONF_DIR}/$file | ||
84 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${CINDER_CONF_DIR}/$file | ||
85 | sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \ | ||
86 | -i ${CINDER_CONF_DIR}/$file | ||
87 | |||
88 | sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CINDER_CONF_DIR}/$file | ||
89 | 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" \ | ||
91 | -i ${CINDER_CONF_DIR}/$file | ||
92 | done | ||
93 | fi | ||
90 | 94 | ||
91 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 95 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
92 | install -d ${D}${sysconfdir}/init.d | 96 | install -d ${D}${sysconfdir}/init.d |
@@ -121,6 +125,10 @@ do_install_append() { | |||
121 | sed -e "s:%IS_DEFAULT%:${is_default}:g" -i ${D}/etc/cinder/drivers/glusterfs_setup.sh | 125 | sed -e "s:%IS_DEFAULT%:${is_default}:g" -i ${D}/etc/cinder/drivers/glusterfs_setup.sh |
122 | } | 126 | } |
123 | 127 | ||
128 | CHEF_SERVICES_CONF_FILES :="\ | ||
129 | ${sysconfdir}/${SRCNAME}/cinder.conf \ | ||
130 | ${sysconfdir}/${SRCNAME}/api-paste.ini \ | ||
131 | " | ||
124 | pkg_postinst_${SRCNAME}-setup () { | 132 | pkg_postinst_${SRCNAME}-setup () { |
125 | if [ "x$D" != "x" ]; then | 133 | if [ "x$D" != "x" ]; then |
126 | exit 1 | 134 | exit 1 |