From 6e0444d8e9be8a850ff646e5c929b158b17988ba Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 29 Aug 2021 00:29:07 +0900
Subject: [PATCH] Fix wrong key to look up domain parameters from puppet.conf

... and refactor the logic to ensure credentials are picked up from
the correct section.

Closes-Bug: #1941953
Change-Id: Ibbc8aa6f31a3e28978d6d779add8ee9dd0dbd6e4
(cherry picked from commit 9e71c1102f863728dd9c440044a7358dfe1b3d24)
(cherry picked from commit 64705ccfbf924803ac072c7a6f2e046251af1f62)
(cherry picked from commit 68d3021365150ce95e8c4ef478b30de8963fd9cd)
---
 lib/puppet/provider/keystone.rb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb
index 9911b6e5a..c00126187 100644
--- a/lib/puppet/provider/keystone.rb
+++ b/lib/puppet/provider/keystone.rb
@@ -25,26 +25,29 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
   end
 
   def self.get_keystone_puppet_credentials
-    auth_keys = ['auth_url', 'project_name', 'username',
-                 'password']
-    conf = keystone_puppet_conf
-    if conf and conf['keystone_authtoken'] and
-        auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
-      creds = Hash[ auth_keys.map \
-                   { |k| [k, conf['keystone_authtoken'][k].strip] } ]
+    auth_keys = ['auth_url', 'project_name', 'username', 'password']
+
+    conf = keystone_puppet_conf ? keystone_puppet_conf['keystone_authtoken'] : {}
+
+    if conf and auth_keys.all?{|k| !conf[k].nil?}
+      creds = Hash[ auth_keys.map { |k| [k, conf[k].strip] } ]
+
       if conf['project_domain_name']
         creds['project_domain_name'] = conf['project_domain_name']
       else
         creds['project_domain_name'] = 'Default'
       end
+
       if conf['user_domain_name']
         creds['user_domain_name'] = conf['user_domain_name']
       else
         creds['user_domain_name'] = 'Default'
       end
-      if conf['keystone_authtoken']['region_name']
-        creds['region_name'] = conf['keystone_authtoken']['region_name']
+
+      if conf['region_name']
+        creds['region_name'] = conf['region_name']
       end
+
       return creds
     else
       raise(Puppet::Error, "File: #{conf_filename} does not contain all " +