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>

1 files changed, 15 insertions, 0 deletions

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%
+
+