Merge "set aodh auth_url explicitly"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Jun 2016 06:22:27 +0000 (06:22 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Jun 2016 06:22:27 +0000 (06:22 +0000)
puppet/controller.yaml

index 70989cc..c445ec0 100644 (file)
@@ -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