From 76bd9e1ab82a67879b58ae617b06227e1fbb044a Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 3 May 2015 19:35:31 -0700
Subject: [PATCH] Nova deprecated proxying options in the DEFAULT group

In Kilo Nova deprecated proxying options in the DEFAULT group.  Instead
they were moved to the "neutron" group.  This resulted in the metadata
service not serving up metadata.

See this bug for more information:

    https://bugzilla.redhat.com/show_bug.cgi?id=1217999

Change-Id: I4f7eac0100d31c5329f8d1857f6d7da1bb6784da
---
 docker/nova-base/config-nova.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh
index fd34dc9944..b5172ee805 100755
--- a/docker/nova-base/config-nova.sh
+++ b/docker/nova-base/config-nova.sh
@@ -84,8 +84,8 @@ if [ "${NETWORK_MANAGER}" == "nova" ] ; then
   crudini --set $cfg DEFAULT public_interface $PUBLIC_INTERFACE
 elif [ "${NETWORK_MANAGER}" == "neutron" ] ; then
   check_required_vars NEUTRON_SHARED_SECRET
-  crudini --set $cfg DEFAULT service_neutron_metadata_proxy True
-  crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET}
+  crudini --set $cfg neutron service_metadata_proxy True
+  crudini --set $cfg neutron metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET}
   crudini --set $cfg DEFAULT neutron_default_tenant_id default
   crudini --set $cfg DEFAULT network_api_class nova.network.neutronv2.api.API
   crudini --set $cfg DEFAULT security_group_api neutron
-- 
GitLab