summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 7f3d2e2..523102a 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -14,6 +14,8 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
14SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ 14SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
15 file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \ 15 file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \
16 file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ 16 file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
17 file://Make-rbd.libvirt_info-parent-class-compatible.patch \
18 file://Fix-rbd-backend-not-working-for-none-admin-ceph-user.patch \
17 " 19 "
18 20
19SRC_URI += "file://nova-all \ 21SRC_URI += "file://nova-all \
@@ -30,6 +32,8 @@ S = "${WORKDIR}/git"
30 32
31inherit update-rc.d setuptools identity hosts useradd default_configs 33inherit update-rc.d setuptools identity hosts useradd default_configs
32 34
35LIBVIRT_IMAGES_TYPE ?= "default"
36
33do_install_append() { 37do_install_append() {
34 if [ ! -f "${WORKDIR}/nova.conf" ]; then 38 if [ ! -f "${WORKDIR}/nova.conf" ]; then
35 return 39 return
@@ -82,6 +86,8 @@ do_install_append() {
82 sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${WORKDIR}/nova.conf 86 sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${WORKDIR}/nova.conf
83 sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${WORKDIR}/nova.conf 87 sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${WORKDIR}/nova.conf
84 88
89 sed -e "s:%LIBVIRT_IMAGES_TYPE%:${LIBVIRT_IMAGES_TYPE}:g" -i ${WORKDIR}/nova.conf
90
85 sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${WORKDIR}/openrc 91 sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${WORKDIR}/openrc
86 sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${WORKDIR}/openrc 92 sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${WORKDIR}/openrc
87 93