From: Alex Schultz <aschultz@redhat.com>
Date: Sat, 10 Dec 2016 22:58:20 +0000 (-0700)
Subject: Switch mistral to use authtoken configuration
X-Git-Tag: opnfv-6.0.0~1316^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ed029e5bf279945e82bff8766af4093856a7ac6a;p=apex-tripleo-heat-templates.git

Switch mistral to use authtoken configuration

The upstream puppet module is adding the proper keystone authtoken
middleware support. This change updates THT to use the keystone
authtoken class rather than the deprecated settings. This also allows
for proper keystone v3 integration.

Change-Id: Iaf82716122a25e3e0785de1250d24edaaa5e4d04
Depends-On: I71969ef09018f9daa5f81c4f3bcbdb0b0974446c
---

diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml
index a11624c0..6a842a1e 100644
--- 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]}