From b228d5639e6a67bd1e6e79068413ba79514976a4 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 7 Mar 2017 12:06:10 -0500
Subject: [PATCH] sahara: configure keystone_authtoken parameters

Configure keystone_authtoken for Sahara service.

Change-Id: I045b7d1d52851ab0d532a8524fcea95705e3db78
Partial-implement: blueprint keystone-v3
---
 puppet/services/sahara-base.yaml                        | 8 +++++---
 releasenotes/notes/sahara_auth_v3-65bd276b39b4e284.yaml | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/sahara_auth_v3-65bd276b39b4e284.yaml

diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index 224989be6f..d5131f6152 100644
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@@ -70,12 +70,14 @@ outputs:
         sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         sahara::rabbit_port: {get_param: RabbitClientPort}
         sahara::debug: {get_param: Debug}
+        # Remove admin_password when https://review.openstack.org/442619 is merged.
         sahara::admin_password: {get_param: SaharaPassword}
-        sahara::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-        sahara::identity_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         sahara::use_neutron: true
         sahara::plugins: {get_param: SaharaPlugins}
         sahara::rpc_backend: rabbit
-        sahara::admin_tenant_name: 'service'
         sahara::db::database_db_max_retries: -1
         sahara::db::database_max_retries: -1
+        sahara::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+        sahara::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+        sahara::keystone::authtoken::password: {get_param: SaharaPassword}
+        sahara::keystone::authtoken::project_name: 'service'
diff --git a/releasenotes/notes/sahara_auth_v3-65bd276b39b4e284.yaml b/releasenotes/notes/sahara_auth_v3-65bd276b39b4e284.yaml
new file mode 100644
index 0000000000..c744e0f7e1
--- /dev/null
+++ b/releasenotes/notes/sahara_auth_v3-65bd276b39b4e284.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Sahara is now deployed with keystone_authtoken parameters and move
+    forward with Keystone v3 version.