From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 9 Aug 2016 12:43:09 +0000 (+0000)
Subject: Merge "Remove outdated Neutron auth options"
X-Git-Tag: opnfv-6.0.0~1777
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=80c692af218a3266780ab795dadf619f3f4395a4;p=apex-tripleo-heat-templates.git

Merge "Remove outdated Neutron auth options"
---

80c692af218a3266780ab795dadf619f3f4395a4
diff --cc puppet/services/neutron-server.yaml
index a63f1857,f4c97b9b..cd602e6e
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@@ -60,16 -56,8 +60,14 @@@ outputs
                    - '@'
                    - {get_param: [EndpointMap, MysqlInternal, host]}
                    - '/ovs_neutron'
 +            neutron::keystone::auth::tenant: 'service'
 +            neutron::keystone::auth::public_url: {get_param: [EndpointMap, NeutronPublic, uri]}
 +            neutron::keystone::auth::internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
 +            neutron::keystone::auth::admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
 +            neutron::keystone::auth::password: {get_param: NeutronPassword}
 +            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}