aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-14 07:37:29 +0000
committerGerrit Code Review <review@openstack.org>2016-07-14 07:37:29 +0000
commitf07dfb129cc5201a4af5db27472a03fb804014a0 (patch)
tree15c23e98623be719904a2e2f311da8d214dfb361
parent20aa74bb7a17a834d46a0635688748f005ead96e (diff)
parent416028c85dbc1cbc4f4f7e847aef9233f6843285 (diff)
downloadkolla-f07dfb129cc5201a4af5db27472a03fb804014a0.tar.gz
kolla-f07dfb129cc5201a4af5db27472a03fb804014a0.zip
Merge "Remove [neutron]/auth_strategy option in nova.conf"
-rw-r--r--ansible/roles/nova/templates/nova.conf.j21
1 files changed, 0 insertions, 1 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 475416096..b9e1b061a 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -110,7 +110,6 @@ catalog_info = volume:cinder:internalURL
[neutron]
url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ neutron_server_port }}
-auth_strategy = keystone
metadata_proxy_shared_secret = {{ metadata_secret }}
service_metadata_proxy = true