From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 8 Aug 2016 10:21:49 +0000 (+0300)
Subject: Move neutron's kestone::auth parameters to server profile
X-Git-Tag: opnfv-6.0.0~1784^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b2ea349adbb18bb76188e5293a863a8bd9a9f64e;p=apex-tripleo-heat-templates.git

Move neutron's kestone::auth parameters to server profile

In the move to composable services, these parameters are not
necessary in the controller, but in the profile itself. They are not
yet in use but will be used to populate the keystone endpoint.

Change-Id: Ia0866d893c2f3258b0e00efcb8894c7643980173
---

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 93ba4760..8c61f1df 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -521,8 +521,6 @@ resources:
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
         neutron_password: {get_param: NeutronPassword}
         neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
-        neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
-        neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
         neutron_auth_url: { get_param: [ EndpointMap, KeystoneV3Admin, uri ] }
         nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
         aodh_internal_url: { get_param: [ EndpointMap, AodhInternal, uri ] }
@@ -729,11 +727,6 @@ resources:
                 neutron::bind_host: {get_input: neutron_api_network}
                 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
                 neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
-                neutron::keystone::auth::public_url: {get_input: neutron_public_url }
-                neutron::keystone::auth::internal_url: {get_input: neutron_internal_url }
-                neutron::keystone::auth::admin_url: {get_input: neutron_admin_url }
-                neutron::keystone::auth::password: {get_input: neutron_password }
-                neutron::keystone::auth::region: {get_input: keystone_region}
 
                 # Aodh
                 aodh::api::host: {get_input: aodh_api_network}
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 3f8ac7e8..f6339c83 100644
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -64,6 +64,5 @@ outputs:
         neutron::allow_overlapping_ips: true
         neutron::rabbit_heartbeat_timeout_threshold: 60
         neutron::host: '"%{::fqdn}"'    #NOTE: extra quoting is needed
-        neutron::keystone::auth::tenant: 'service'
         neutron::db::database_db_max_retries: -1
         neutron::db::database_max_retries: -1
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index d64fd66d..a63f1857 100644
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -33,6 +33,10 @@ parameters:
     description: Enable Neutron DVR.
     default: false
     type: boolean
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
 
@@ -56,6 +60,12 @@ 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'