diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-04 09:46:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-04 09:46:47 +0000 |
| commit | 70d1950c9476b16d58418d55247f68774b72aac7 (patch) | |
| tree | ebb3c0b132698244963c06fe75ecfacc18080d70 /puppet/services/gnocchi-base.yaml | |
| parent | 656b4f9887878b6d933311086cf1e2316f5f593a (diff) | |
| parent | 9b36f36a0527452937055f97f77cd6aa4dea7460 (diff) | |
Merge "Replace hard-coded regionOne with parameter references"
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' |