diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 10:38:25 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 10:38:25 +0000 |
commit | 213099a681a2649612adc7f6df6c37d40c47a8e6 (patch) | |
tree | cab0e6b5165756bb3eccc482a2541816c1e8be3a /puppet/services/aodh-base.yaml | |
parent | 2903a9e4cdb55628ecdd76557e9c7814827d04ab (diff) | |
parent | b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 (diff) |
Merge "Update authtoken parameters to match recent changes"
Diffstat (limited to 'puppet/services/aodh-base.yaml')
-rw-r--r-- | puppet/services/aodh-base.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 603b2d82..15f81953 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -82,9 +82,10 @@ outputs: aodh::rabbit_password: {get_param: RabbitPassword} aodh::rabbit_use_ssl: {get_param: RabbitClientUseSSL} aodh::rabbit_port: {get_param: RabbitClientPort} - aodh::api::keystone_password: {get_param: AodhPassword} - aodh::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } - aodh::api::keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } + aodh::keystone::authtoken::project_name: 'service' + aodh::keystone::authtoken::password: {get_param: AodhPassword} + aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } aodh::auth::auth_password: {get_param: AodhPassword} aodh::keystone::auth::public_url: {get_param: [EndpointMap, AodhPublic, uri]} aodh::keystone::auth::internal_url: {get_param: [EndpointMap, AodhInternal, uri]} |