summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 06:22:27 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 06:22:27 +0000
commit9c16693ef8c47981a209f5b37b88d95a3e72cbab (patch)
tree3135268286ff38043550240e3cd11f95f36535a6
parent8c20e01c8e7b7ee256182390cff56ef90e126e1f (diff)
parentf3e004ce8380b196d2a250507b3f7ea3093428f3 (diff)
Merge "set aodh auth_url explicitly"
-rw-r--r--puppet/controller.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 70989ccf..c445ec03 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -974,6 +974,7 @@ resources:
aodh::api::keystone_password: {get_input: aodh_password}
aodh::api::keystone_auth_uri: {get_input: keystone_auth_uri}
aodh::api::keystone_identity_uri: {get_input: keystone_identity_uri}
+ aodh::auth::auth_url: {get_input: keystone_auth_uri}
aodh::auth::auth_password: {get_input: aodh_password}
aodh::db::mysql::password: {get_input: aodh_password}
# for a migration path from ceilometer-alarm to aodh, we use the same database & coordination