Specify the Ceph packages to be installed

[apex-tripleo-heat-templates.git] / puppet / services / aodh-base.yaml

diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml
index 603b2d8..187345a 100644 (file)
--- a/puppet/services/aodh-base.yaml
+++ b/puppet/services/aodh-base.yaml
@@ -77,14 +77,15 @@ outputs:
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/aodh'
         aodh::debug: {get_param: Debug}
-        aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri] }
+        aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         aodh::rabbit_userid: {get_param: RabbitUserName}
         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]}