X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fgnocchi-base.yaml;h=a408d5d783306e99b2846af215f2ad7ba72bcf0e;hb=73656aac0dbf1e0bbc8ee10cf5f282c93af4174b;hp=fa00f736e89a9d182a1f77241fa5256cfcf99b48;hpb=11a27c9a3b4e0969f3a89c2a9485f72317577c12;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index fa00f736..a408d5d7 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -30,6 +30,10 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 outputs:
   aux_parameters:
@@ -39,7 +43,7 @@ outputs:
   role_data:
     description: Shared role data for the Heat services.
     value:
-      service_name: gnocchi-base
+      service_name: gnocchi_base
       config_settings:
         #Gnocchi engine
         gnocchi::debug: {get_input: debug}
@@ -52,7 +56,7 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
-        gnocchi::keystone::auth::region: 'regionOne'
+        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}
@@ -90,3 +94,5 @@ outputs:
         gnocchi::db::mysql::allowed_hosts:
           - '%'
           - "%{hiera('mysql_bind_host')}"
+        gnocchi::auth::auth_region: {get_param: KeystoneRegion}
+        gnocchi::auth::auth_tenant_name: 'service'