aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-27 20:51:27 +0000
committerGerrit Code Review <review@openstack.org>2017-04-27 20:51:27 +0000
commit48e1b90594f6cb0d91fc6eb2c989de1a043c0ee5 (patch)
tree94e1462b6a996a0c463dd285e0ba6d7478dffb2a /puppet/services
parent25d052833c259c86b4ec810576a6cb6b3deea97c (diff)
parent7f42098c3a4df00ff755b48efbb623ef127ec2c6 (diff)
Merge "aodh-base.yaml uses a hard coded keystone region name"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/aodh-base.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml
index 48a2aecd..5b78e28b 100644
--- a/puppet/services/aodh-base.yaml
+++ b/puppet/services/aodh-base.yaml
@@ -83,7 +83,7 @@ outputs:
aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::auth::auth_password: {get_param: AodhPassword}
- aodh::auth::auth_region: 'regionOne'
+ aodh::auth::auth_region: {get_param: KeystoneRegion}
aodh::auth::auth_tenant_name: 'service'
service_config_settings:
keystone: