From e677aeacd706674762751f8b530ad08d6d925910 Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Thu, 4 Jul 2019 18:22:14 +0200
Subject: [PATCH] Set nova::keystone auth details hiera on compute

For config drive we need to set the [api]/dhcp_domain
in the computes. Therefore ::nova::metadata is included
via https://review.opendev.org/668949 to the
tripleo::profile::base::nova::compute class. We'd need
to add this informaton as the ::nova::metadata includes
::nova::keystone::authtoken.

Change-Id: Ib5d7cdd8efcb40d313a55b6ab516e7f15e619187
Related-Bug: #1832537
---
 deployment/nova/nova-compute-container-puppet.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index a4192a3377..20bb29fe79 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -319,6 +319,10 @@ parameters:
     default: false
     description: Whether to enable the multipath daemon
     type: boolean
+  NovaPassword:
+    description: The password for the nova service and db account
+    type: string
+    hidden: true
 
 resources:
 
@@ -474,6 +478,14 @@ outputs:
                 - {get_param: CephClientUserName}
             tripleo::profile::base::nova::compute::cinder_nfs_backend: {get_param: CinderEnableNfsBackend}
             rbd_persistent_storage: {get_param: CinderEnableRbdBackend}
+            nova::keystone::authtoken::project_name: 'service'
+            nova::keystone::authtoken::user_domain_name: 'Default'
+            nova::keystone::authtoken::project_domain_name: 'Default'
+            nova::keystone::authtoken::password: {get_param: NovaPassword}
+            nova::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
+            nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
+            nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            nova::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             nova::cinder::username: 'cinder'
             nova::cinder::auth_type: 'v3password'
             nova::cinder::project_name: 'service'