X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fgnocchi-base.yaml;h=3631508e90dbfa9bd4f21ed8556dae5eb4586b04;hb=25b60832bd11b1395d51587a7747b0c7d514fee4;hp=e49c440b36be4e5b2cc7cd9504d27ecc21efbe39;hpb=b3afa4126d442570087a3eca4d687ed95dff12ad;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index e49c440b..3631508e 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,6 +43,7 @@ outputs:
   role_data:
     description: Shared role data for the Heat services.
     value:
+      service_name: gnocchi_base
       config_settings:
         #Gnocchi engine
         gnocchi::debug: {get_input: debug}
@@ -51,9 +56,6 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
-        gnocchi::keystone::auth::region: 'regionOne'
-        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
@@ -61,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'
@@ -84,8 +85,10 @@ outputs:
         gnocchi::statsd::flush_delay: 10
         gnocchi::statsd::archive_policy_name: 'low'
         gnocchi::db::mysql::user: gnocchi
-        gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]}
+        gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
         gnocchi::db::mysql::dbname: gnocchi
         gnocchi::db::mysql::allowed_hosts:
           - '%'
           - "%{hiera('mysql_bind_host')}"
+        gnocchi::auth::auth_region: {get_param: KeystoneRegion}
+        gnocchi::auth::auth_tenant_name: 'service'