From a19da8ef498f4e4fb85f74834b547c79085cfa65 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 15 Aug 2016 14:05:20 -0400
Subject: gnocchi: use new authtoken parameters

Configure Gnocchi with authtoken new class in the Puppet module, and
also remove the useless parameters that didn't exist in the module.

Change-Id: I414990c4fd5c5c1cd43d50c7a3947a4a29f4587a
---
 puppet/services/gnocchi-api.yaml  | 25 ++++++++++++++++++++-----
 puppet/services/gnocchi-base.yaml | 16 ----------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index 265cb9f0..19c77612 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -13,6 +13,13 @@ parameters:
     description: The password for the gnocchi service and db account.
     type: string
     hidden: true
+  GnocchiBackend:
+    default: file
+    description: The short name of the Gnocchi backend to use. Should be one
+      of swift, rbd, or file
+    type: string
+    constraints:
+    - allowed_values: ['swift', 'file', 'rbd']
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -37,12 +44,20 @@ outputs:
                 dport:
                   - 8041
                   - 13041
-            gnocchi::api::keystone_tenant: 'service'
-            gnocchi::keystone::auth::tenant: 'service'
-            gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
+            gnocchi::api::enabled: true
+            gnocchi::api::manage_service: false
+            gnocchi::api::service_name: 'httpd'
+            gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
+            gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
             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 ] }
+            gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
+            gnocchi::keystone::auth::tenant: 'service'
+            gnocchi::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+            gnocchi::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            gnocchi::keystone::authtoken::password: {get_param: GnocchiPassword}
+            gnocchi::keystone::authtoken::project_name: 'service'
+            gnocchi::wsgi::apache::ssl: false
+            tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
       step_config: |
         include ::tripleo::profile::base::gnocchi::api
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index a072e8ef..844d1469 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -9,13 +9,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  GnocchiBackend:
-    default: file
-    description: The short name of the Gnocchi backend to use. Should be one
-      of swift, rbd, or file
-    type: string
-    constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
   GnocchiIndexerBackend:
     default: 'mysql'
     description: The short name of the Gnocchi indexer backend to use.
@@ -62,13 +55,6 @@ outputs:
               - '/gnocchi'
         gnocchi::db::mysql::password: {get_param: GnocchiPassword}
         gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
-        #Gnocchi API
-        tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
-        gnocchi::api::manage_service: false
-        gnocchi::api::enabled: true
-        gnocchi::api::service_name: 'httpd'
-        gnocchi::api::keystone_password: {get_param: GnocchiPassword}
-        gnocchi::wsgi::apache::ssl: false
         gnocchi::storage::coordination_url:
           list_join:
             - ''
@@ -102,5 +88,3 @@ outputs:
         gnocchi::db::mysql::allowed_hosts:
           - '%'
           - "%{hiera('mysql_bind_host')}"
-        gnocchi::auth::auth_region: {get_param: KeystoneRegion}
-        gnocchi::auth::auth_tenant_name: 'service'
-- 
cgit 1.2.3-korg