From 65acd817cf2a807859f93cf5eb61127b6e5a6915 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 30 Apr 2014 00:07:28 -0400
Subject: 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>
---
 .../recipes-devtools/python/python-nova/nova.conf         | 15 +++++++++++++++
 meta-openstack/recipes-devtools/python/python-nova_git.bb | 13 ++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'meta-openstack/recipes-devtools/python')

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index d763a8b..35eed8b 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -56,6 +56,10 @@ neutron_admin_username=neutron
 neutron_admin_password=password
 neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/
 
+# Disables reporting of network state to the controller
+vif_plugging_timeout=10
+vif_plugging_is_fatal=False
+
 # nova-compute configuration for ceilometer
 instance_usage_audit=True
 instance_usage_audit_period=hour
@@ -76,3 +80,14 @@ html5proxy_base_url=http://%CONTROLLER_IP%:6082/spice_auto.html
 keymap=en-us
 server_listen=%COMPUTE_IP%
 server_proxyclient_address=%COMPUTE_IP%
+
+auth_strategy=keystone
+[keystone_authtoken]
+auth_host = %CONTROLLER_IP%
+auth_port = 35357
+auth_protocol = http
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+
+
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"
 
 FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
-           file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \
            file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
            "
 
@@ -22,8 +21,8 @@ SRC_URI += "file://nova-all \
             file://nova.conf \
             file://openrc \
            "
-SRCREV="feedcb240807cdfa354d27ebe3a4b7f416504a62"
-PV="2013.2.2+git${SRCPV}"
+SRCREV="e1e140b295ea9ea6fd6cc2b6dc10981020e48adb"
+PV="2014.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
@@ -88,6 +87,10 @@ do_install_append() {
     sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${NOVA_CONF_DIR}/nova.conf
     sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${NOVA_CONF_DIR}/nova.conf
 
+    sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${NOVA_CONF_DIR}/nova.conf
+    sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${NOVA_CONF_DIR}/nova.conf
+    sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" -i ${NOVA_CONF_DIR}/nova.conf
+
     sed -e "s:%LIBVIRT_IMAGES_TYPE%:${LIBVIRT_IMAGES_TYPE}:g" -i ${NOVA_CONF_DIR}/nova.conf
 
     sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${NOVA_CONF_DIR}/openrc
@@ -274,7 +277,7 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
                                   ${SRCNAME}-api \
 				  postgresql postgresql-client python-psycopg2"
 
-RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common \
+RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \
 			       qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh"
 RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common"
 
-- 
cgit v1.2.3-54-g00ecf