diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-30 00:07:28 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-30 00:07:28 -0400 |
commit | 65acd817cf2a807859f93cf5eb61127b6e5a6915 (patch) | |
tree | 507596f747449dcb01a4e453d7130fb4babef849 /meta-openstack/recipes-devtools/python/python-nova_git.bb | |
parent | fbc0ca6e73d501f4dcb94eb8303f3906d3cc2fca (diff) | |
download | meta-cloud-services-65acd817cf2a807859f93cf5eb61127b6e5a6915.tar.gz |
nova: uprev to icehouse/stable support
Updating the recipe's branch and SRCREV to the icehouse/stable release
branch.
The configuration changes required for basic operation are limited, so
we keep nearly everything the same, and will update the config in
subsequent commits.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index d77260e..0c6686d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
@@ -11,8 +11,7 @@ SRCNAME = "nova" | |||
11 | 11 | ||
12 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 12 | FILESEXTRAPATHS := "${THISDIR}/${PN}" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ |
15 | file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \ | ||
16 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ |
17 | " | 16 | " |
18 | 17 | ||
@@ -22,8 +21,8 @@ SRC_URI += "file://nova-all \ | |||
22 | file://nova.conf \ | 21 | file://nova.conf \ |
23 | file://openrc \ | 22 | file://openrc \ |
24 | " | 23 | " |
25 | SRCREV="feedcb240807cdfa354d27ebe3a4b7f416504a62" | 24 | SRCREV="e1e140b295ea9ea6fd6cc2b6dc10981020e48adb" |
26 | PV="2013.2.2+git${SRCPV}" | 25 | PV="2014.1+git${SRCPV}" |
27 | 26 | ||
28 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
29 | 28 | ||
@@ -88,6 +87,10 @@ do_install_append() { | |||
88 | sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${NOVA_CONF_DIR}/nova.conf | 87 | sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${NOVA_CONF_DIR}/nova.conf |
89 | sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${NOVA_CONF_DIR}/nova.conf | 88 | sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${NOVA_CONF_DIR}/nova.conf |
90 | 89 | ||
90 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${NOVA_CONF_DIR}/nova.conf | ||
91 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${NOVA_CONF_DIR}/nova.conf | ||
92 | sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" -i ${NOVA_CONF_DIR}/nova.conf | ||
93 | |||
91 | sed -e "s:%LIBVIRT_IMAGES_TYPE%:${LIBVIRT_IMAGES_TYPE}:g" -i ${NOVA_CONF_DIR}/nova.conf | 94 | sed -e "s:%LIBVIRT_IMAGES_TYPE%:${LIBVIRT_IMAGES_TYPE}:g" -i ${NOVA_CONF_DIR}/nova.conf |
92 | 95 | ||
93 | sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${NOVA_CONF_DIR}/openrc | 96 | sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${NOVA_CONF_DIR}/openrc |
@@ -274,7 +277,7 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ | |||
274 | ${SRCNAME}-api \ | 277 | ${SRCNAME}-api \ |
275 | postgresql postgresql-client python-psycopg2" | 278 | postgresql postgresql-client python-psycopg2" |
276 | 279 | ||
277 | RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common \ | 280 | RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ |
278 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" | 281 | qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" |
279 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" | 282 | RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" |
280 | 283 | ||