From a9c64bd39d28cc073a7f2d19a17466d29be6cc0f Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Mon, 27 Feb 2017 12:56:58 -0500
Subject: Adding keystone parameters for Tacker

Change-Id: I256d2fcb6353d029750113c1fec59a89c82583ca
---
 puppet/services/tacker.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml
index 6ceb9f19..23b00c15 100644
--- a/puppet/services/tacker.yaml
+++ b/puppet/services/tacker.yaml
@@ -66,9 +66,6 @@ outputs:
               - '/tacker'
               - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
 
-        tacker::keystone::auth::tenant: 'service'
-        tacker::keystone::auth::password: {get_param: TackerPassword}
-        tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
         tacker::debug: {get_param: Debug}
         tacker::rpc_backend: rabbit
         tacker::rabbit_userid: {get_param: RabbitUserName}
@@ -77,6 +74,10 @@ outputs:
         tacker::rabbit_port: {get_param: RabbitClientPort}
         tacker::server::bind_host: {get_param: [ServiceNetMap, TackerApiNetwork]}
 
+        tacker::keystone::authtoken::project_name: 'service'
+        tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+        tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+
         tacker::db::mysql::password: {get_param: TackerPassword}
         tacker::db::mysql::user: tacker
         tacker::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
@@ -85,6 +86,13 @@ outputs:
           - '%'
           - {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
 
+      service_config_settings:
+        keystone:
+          tacker::keystone::auth::tenant: 'service'
+          tacker::keystone::auth::password: {get_param: TackerPassword}
+          tacker::keystone::auth::public_url: {get_param: [EndpointMap, TackerPublic, uri]}
+          tacker::keystone::auth::internal_url: {get_param: [EndpointMap, TackerInternal, uri]}
+          tacker::keystone::auth::admin_url: {get_param: [EndpointMap, TackerAdmin, uri]}
 
       step_config: |
         include ::tripleo::profile::base::tacker
-- 
cgit 1.2.3-korg