diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 12:43:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 12:43:09 +0000 |
| commit | 80c692af218a3266780ab795dadf619f3f4395a4 (patch) | |
| tree | 13a59793ce66433b2b702f76df7f5bfe0e008c62 | |
| parent | 173ce97b0c404e0dd815b299080fbdc89b680bc9 (diff) | |
| parent | c4f865991844348fe114935b00e843e0bcd5a91e (diff) | |
Merge "Remove outdated Neutron auth options"
| -rw-r--r-- | puppet/services/neutron-server.yaml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index a63f1857..cd602e6e 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -68,12 +68,10 @@ outputs: neutron::keystone::auth::region: {get_param: KeystoneRegion} 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 ] } |