From ba1fb563d10ae527d19663b94c76216fbf7e8591 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 8 Aug 2016 13:40:23 +0300
Subject: [PATCH] Move gnocchi'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: Iab3ab05e16872d94d3b3ab4827e2f87f4970aee3
---
 puppet/controller.yaml            |  7 -------
 puppet/services/gnocchi-api.yaml  | 16 +++++++++++++++-
 puppet/services/gnocchi-base.yaml |  4 ----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 93f0e03e4b..3e12fbb302 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -525,9 +525,6 @@ resources:
               - '@'
               - {get_param: RedisVirtualIPUri}
               - ':6379/'
-        gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
-        gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
-        gnocchi_admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
         nova_enable_db_purge: {get_param: NovaEnableDBPurge}
         nova_ipv6: {get_param: NovaIPv6}
         corosync_ipv6: {get_param: CorosyncIPv6}
@@ -717,10 +714,6 @@ resources:
                 gnocchi::api::keystone_auth_uri: {get_input: keystone_auth_uri}
                 gnocchi::api::keystone_identity_uri: {get_input: keystone_identity_uri}
                 gnocchi::storage::swift::swift_authurl: {get_input: keystone_auth_uri}
-                gnocchi::keystone::auth::public_url: {get_input: gnocchi_public_url }
-                gnocchi::keystone::auth::internal_url: {get_input: gnocchi_internal_url }
-                gnocchi::keystone::auth::admin_url: {get_input: gnocchi_admin_url }
-                gnocchi::keystone::auth::region: {get_input: keystone_region}
 
                 # Nova
                 nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute}
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index d97626a6ea..265cb9f0f1 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -9,6 +9,14 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  GnocchiPassword:
+    description: The password for the gnocchi service and db account.
+    type: string
+    hidden: true
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
   GnocchiServiceBase:
@@ -29,6 +37,12 @@ outputs:
                 dport:
                   - 8041
                   - 13041
-          - gnocchi::api::keystone_tenant: 'service'
+            gnocchi::api::keystone_tenant: 'service'
+            gnocchi::keystone::auth::tenant: 'service'
+            gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
+            gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
+            gnocchi::keystone::auth::public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
+            gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
+            gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
       step_config: |
         include ::tripleo::profile::base::gnocchi::api
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index a408d5d783..9e30ee15fd 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -56,9 +56,6 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
-        gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
-        gnocchi::keystone::auth::tenant: 'service'
-        gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
         gnocchi::db::mysql::password: {get_param: GnocchiPassword}
         gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
         #Gnocchi API
@@ -66,7 +63,6 @@ outputs:
         gnocchi::api::manage_service: false
         gnocchi::api::enabled: true
         gnocchi::api::service_name: 'httpd'
-        gnocchi::api::keystone_tenant: 'service'
         gnocchi::api::keystone_password: {get_param: GnocchiPassword}
         gnocchi::wsgi::apache::ssl: false
         gnocchi::storage::swift::swift_user: 'service:gnocchi'