summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-03 19:35:31 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 13:54:04 -0700
commit76bd9e1ab82a67879b58ae617b06227e1fbb044a (patch)
tree98277329d9ae58cc5c566f941009a874fd273f66 /docker
parent14fb8fd69a36599b78421c68cce6693dd30b388a (diff)
downloadkolla-76bd9e1ab82a67879b58ae617b06227e1fbb044a.tar.gz
kolla-76bd9e1ab82a67879b58ae617b06227e1fbb044a.zip
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
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/nova-base/config-nova.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh
index fd34dc994..b5172ee80 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