From c4f865991844348fe114935b00e843e0bcd5a91e Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Mon, 8 Aug 2016 16:08:11 +0300 Subject: 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 --- puppet/services/neutron-server.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'puppet') 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 ] } -- cgit 1.2.3-korg