summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Kolekonov <skolekonov@mirantis.com>2016-08-08 16:08:11 +0300
committerSergey Kolekonov <skolekonov@mirantis.com>2016-08-08 16:09:40 +0300
commitc4f865991844348fe114935b00e843e0bcd5a91e (patch)
treed6ccb444881f72a06a782928da016d5ba076205d
parentff43f1d38ac2821b24ed81fc4b3537be7035f8a5 (diff)
Remove outdated Neutron auth options
Currently Keystone auth plugins should be used to perform authorization. admin_* parameters as well as identity_uri are deprecated and not needed Change-Id: I3018932a106df562e94067e037b3bc862be97b51
-rw-r--r--puppet/services/neutron-server.yaml4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index d64fd66d..f4c97b9b 100644
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -58,12 +58,10 @@ outputs:
- '/ovs_neutron'
neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
- neutron::server::auth_tenant: 'service'
- neutron::server::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
neutron::server::api_workers: {get_param: NeutronWorkers}
neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
neutron::server::l3_ha: {get_param: NeutronL3HA}
- neutron::server::auth_password: {get_param: NeutronPassword}
+ neutron::server::password: {get_param: NeutronPassword}
neutron::server::notifications::nova_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
neutron::server::notifications::auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }