From 470c51a63300d60d670667030a4d0426d7c965f7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 10 Jan 2022 22:30:00 +0900
Subject: [PATCH] Add support for [keystone_auth] auth_type

Change-Id: Ic631806cc4d4d930e4eeef9e77ff97aba443d7ee
---
 manifests/keystone/keystone_auth.pp                         | 6 ++++++
 .../notes/keystone_auth-auth_type-15e6fb6d13940181.yaml     | 5 +++++
 spec/classes/magnum_keystone_keystone_auth_spec.rb          | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/keystone_auth-auth_type-15e6fb6d13940181.yaml

diff --git a/manifests/keystone/keystone_auth.pp b/manifests/keystone/keystone_auth.pp
index 7b31fa0..a26e083 100644
--- a/manifests/keystone/keystone_auth.pp
+++ b/manifests/keystone/keystone_auth.pp
@@ -28,6 +28,10 @@
 #   (Optional) Name of domain for $project_name
 #   Defaults to 'Default'
 #
+# [*auth_type*]
+#   (Optional) Authentication type to load
+#   Defaults to 'password'
+#
 class magnum::keystone::keystone_auth(
   $username            = 'magnum',
   $password            = $::os_service_default,
@@ -35,6 +39,7 @@ class magnum::keystone::keystone_auth(
   $project_name        = 'services',
   $user_domain_name    = 'Default',
   $project_domain_name = 'Default',
+  $auth_type           = 'password',
 ) {
 
   include magnum::deps
@@ -49,6 +54,7 @@ class magnum::keystone::keystone_auth(
       'keystone_auth/project_name'        : value => $project_name;
       'keystone_auth/project_domain_name' : value => $project_domain_name;
       'keystone_auth/user_domain_name'    : value => $user_domain_name;
+      'keystone_auth/auth_type'           : value => $auth_type;
     }
   }
 }
diff --git a/releasenotes/notes/keystone_auth-auth_type-15e6fb6d13940181.yaml b/releasenotes/notes/keystone_auth-auth_type-15e6fb6d13940181.yaml
new file mode 100644
index 0000000..affcb9d
--- /dev/null
+++ b/releasenotes/notes/keystone_auth-auth_type-15e6fb6d13940181.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``auth_type`` parameter has been added to
+    the ``magnum::keystone::keystone_auth`` class.
diff --git a/spec/classes/magnum_keystone_keystone_auth_spec.rb b/spec/classes/magnum_keystone_keystone_auth_spec.rb
index fa246b7..4a9dea8 100644
--- a/spec/classes/magnum_keystone_keystone_auth_spec.rb
+++ b/spec/classes/magnum_keystone_keystone_auth_spec.rb
@@ -28,6 +28,7 @@ describe 'magnum::keystone::keystone_auth' do
         is_expected.to contain_magnum_config('keystone_auth/project_name').with_value('services')
         is_expected.to contain_magnum_config('keystone_auth/user_domain_name').with_value('Default')
         is_expected.to contain_magnum_config('keystone_auth/project_domain_name').with_value('Default')
+        is_expected.to contain_magnum_config('keystone_auth/auth_type').with_value('password')
       end
     end
 
@@ -41,6 +42,7 @@ describe 'magnum::keystone::keystone_auth' do
           :project_name        => 'service_project',
           :user_domain_name    => 'domainX',
           :project_domain_name => 'domainX',
+          :auth_type           => 'v3password',
         })
       end
 
@@ -51,6 +53,7 @@ describe 'magnum::keystone::keystone_auth' do
         is_expected.to contain_magnum_config('keystone_auth/project_name').with_value(params[:project_name])
         is_expected.to contain_magnum_config('keystone_auth/user_domain_name').with_value(params[:user_domain_name])
         is_expected.to contain_magnum_config('keystone_auth/project_domain_name').with_value(params[:project_domain_name])
+        is_expected.to contain_magnum_config('keystone_auth/auth_type').with_value(params[:auth_type])
       end
     end
   end