From 452d2c21a3dde681cf7ee778d9be84db1c938bb7 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 28 Apr 2017 09:55:55 -0400
Subject: [PATCH] Deploy Mistral with Keystone v3 options (authtoken)

Deploy Mistral with Keystone v3 options (authtoken) like we do for other
services.

Change-Id: I145f02eb5e00e00f8b90b32d1fd495a5b3a2726b
Depends-On: Ibc600c16195816d90b817a96029845a2954ac809
---
 puppet/services/mistral-base.yaml                      | 10 ++++++----
 .../notes/keystone_authtoken-655da476bbf82e1c.yaml     |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/keystone_authtoken-655da476bbf82e1c.yaml

diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml
index dbcc3f7918..e4a1157c78 100644
--- a/puppet/services/mistral-base.yaml
+++ b/puppet/services/mistral-base.yaml
@@ -101,15 +101,17 @@ outputs:
           - service_debug_unset
           - {get_param: Debug }
           - {get_param: MistralDebug }
-        mistral::keystone_password: {get_param: MistralPassword}
-        mistral::keystone_tenant: 'service'
-        mistral::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+        mistral::keystone::authtoken::project_name: 'service'
+        mistral::keystone::authtoken::user_domain_name: 'Default'
+        mistral::keystone::authtoken::project_domain_name: 'Default'
+        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, KeystoneInternal, uri_no_suffix]}
         mistral::keystone_ec2_uri:
           list_join:
           - ''
           - - {get_param: [EndpointMap, KeystoneV3Internal, uri]}
             - '/ec2tokens'
-        mistral::identity_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
       service_config_settings:
         keystone:
           mistral::keystone::auth::tenant: 'service'
diff --git a/releasenotes/notes/keystone_authtoken-655da476bbf82e1c.yaml b/releasenotes/notes/keystone_authtoken-655da476bbf82e1c.yaml
new file mode 100644
index 0000000000..c91f5dfaea
--- /dev/null
+++ b/releasenotes/notes/keystone_authtoken-655da476bbf82e1c.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Mistral is now deployed with Keystone v3 options (authtoken).