Merge "Switch mistral to use authtoken configuration"

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

diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml
index a11624c..6a842a1 100644 (file)
--- a/puppet/services/mistral-base.yaml
+++ b/puppet/services/mistral-base.yaml
@@ -70,8 +70,10 @@ outputs:
         mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         mistral::rabbit_port: {get_param: RabbitClientPort}
         mistral::debug: {get_param: Debug}
-        mistral::keystone_password: {get_param: MistralPassword}
-        mistral::keystone_tenant: 'service'
+        mistral::keystone::authtoken::project_name: 'service'
+        mistral::keystone::authtoken::password: {get_param: MistralPassword}
+        mistral::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+        mistral::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
         mistral::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
         mistral::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
         mistral::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}