diff options
author | Steven Hardy <shardy@redhat.com> | 2016-08-03 15:01:57 +0100 |
---|---|---|
committer | Steven Hardy <shardy@redhat.com> | 2016-08-03 15:01:57 +0100 |
commit | 9b36f36a0527452937055f97f77cd6aa4dea7460 (patch) | |
tree | bfec1e9c6a6fba6781f0a243fa891a9cb0eeced1 /puppet/services/gnocchi-base.yaml | |
parent | 6d211425d7db5328d94638e7684561ff81b5195f (diff) |
Replace hard-coded regionOne with parameter references
In a few places we hard-code the config values to regionOne, but
there is a parameter available to set this.
Change-Id: I9f5138103deb45f7432ee44e03a08dcf54c2990d
Diffstat (limited to 'puppet/services/gnocchi-base.yaml')
-rw-r--r-- | puppet/services/gnocchi-base.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index 5c1e015e..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: @@ -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,5 +94,5 @@ outputs: gnocchi::db::mysql::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" - gnocchi::auth::auth_region: 'regionOne' + gnocchi::auth::auth_region: {get_param: KeystoneRegion} gnocchi::auth::auth_tenant_name: 'service' |