Move cinder's kestone::auth parameters to API 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: Ib9b0e474f875a4b2ffbda11c01cb882149997b0c

3 files changed, 13 insertions, 15 deletions

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 8c61f1df..f6410146 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -495,12 +495,6 @@ resources:
         horizon_secret: {get_param: HorizonSecret}
         admin_password: {get_param: AdminPassword}
         debug: {get_param: Debug}
-        cinder_public_url: {get_param: [EndpointMap, CinderPublic, uri]}
-        cinder_internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
-        cinder_admin_url: {get_param: [EndpointMap, CinderAdmin, uri]}
-        cinder_public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
-        cinder_internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
-        cinder_admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}
         keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
         keystone_ec2_uri: { get_param: [EndpointMap, KeystoneEC2, uri] }
@@ -680,14 +674,6 @@ resources:
                 # Cinder
                 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_input: cinder_iscsi_network}
                 cinder::api::bind_host: {get_input: cinder_api_network}
-                cinder::keystone::auth::public_url: {get_input: cinder_public_url }
-                cinder::keystone::auth::internal_url: {get_input: cinder_internal_url }
-                cinder::keystone::auth::admin_url: {get_input: cinder_admin_url }
-                cinder::keystone::auth::public_url_v2: {get_input: cinder_public_url_v2 }
-                cinder::keystone::auth::internal_url_v2: {get_input: cinder_internal_url_v2 }
-                cinder::keystone::auth::admin_url_v2: {get_input: cinder_admin_url_v2 }
-                cinder::keystone::auth::password: {get_input: cinder_password }
-                cinder::keystone::auth::region: {get_input: keystone_region}
 
                 # Glance
                 glance::api::bind_host: {get_input: glance_api_network}
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index fa2324b3..4f383456 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -18,6 +18,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
 
@@ -38,6 +42,15 @@ outputs:
             cinder::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
             cinder::keystone::authtoken::password: {get_param: CinderPassword}
             cinder::keystone::authtoken::project_name: 'service'
+            cinder::keystone::auth::tenant: 'service'
+            cinder::keystone::auth::public_url: {get_param: [EndpointMap, CinderPublic, uri]}
+            cinder::keystone::auth::internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
+            cinder::keystone::auth::admin_url: {get_param: [EndpointMap, CinderAdmin, uri]}
+            cinder::keystone::auth::public_url_v2: {get_param: [EndpointMap, CinderV2Public, uri]}
+            cinder::keystone::auth::internal_url_v2: {get_param: [EndpointMap, CinderV2Internal, uri]}
+            cinder::keystone::auth::admin_url_v2: {get_param: [EndpointMap, CinderV2Admin, uri]}
+            cinder::keystone::auth::password: {get_param: CinderPassword}
+            cinder::keystone::auth::region: {get_param: KeystoneRegion}
             cinder::api::enable_proxy_headers_parsing: true
             cinder::api::nova_catalog_info: 'compute:Compute Service:internalURL'
             # TODO(emilien) move it to puppet-cinder
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index d923e7c6..f5d98afa 100644
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -64,7 +64,6 @@ outputs:
           - '%'
           - "%{hiera('mysql_bind_host')}"
         cinder::rabbit_heartbeat_timeout_threshold: 60
-        cinder::keystone::auth::tenant: 'service'
         cinder::host: hostgroup
         cinder::cron::db_purge::destination: '/dev/null'
         cinder::db::database_db_max_retries: -1