From 44f05740d29fe869a335bfc4fdc5dae0127b7e87 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 24 Mar 2020 23:32:09 +0100
Subject: [PATCH] Add keystone_region_name to magnum::keystone::domain

Is used to configure the trust/trustee_keystone_region_name
configuration option.

Change-Id: Id27849c76e4d970810b122ef478e333e82c0d495
(cherry picked from commit 7faad823d1b62b1d2b07fc84a8fe62f9aae04653)
---
 manifests/keystone/domain.pp                          | 11 +++++++++--
 .../notes/keystone-region-name-aadb659d8a2c00f1.yaml  |  4 ++++
 spec/classes/magnum_keystone_domain_spec.rb           |  4 +++-
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/keystone-region-name-aadb659d8a2c00f1.yaml

diff --git a/manifests/keystone/domain.pp b/manifests/keystone/domain.pp
index 3fa17fa..7c3a78c 100644
--- a/manifests/keystone/domain.pp
+++ b/manifests/keystone/domain.pp
@@ -48,6 +48,11 @@
 #   Auth interface used by instances/trustee.
 #   Defaults to 'public'.
 #
+# [*keystone_region_name*]
+#   Region in Identity service catalog to use for
+#   communication with the OpenStack service.
+#   Defaults to $::os_service_default.
+#
 # [*manage_domain*]
 #   Whether manage or not the domain creation.
 #   If using the default domain, it needs to be False because puppet-keystone
@@ -72,11 +77,12 @@ class magnum::keystone::domain (
   $domain_password          = 'changeme',
   $domain_admin_domain_name = $::os_service_default,
   $domain_admin_domain_id   = $::os_service_default,
+  $roles                    = $::os_service_default,
+  $keystone_interface       = 'public',
+  $keystone_region_name     = $::os_service_default,
   $manage_domain            = true,
   $manage_user              = true,
   $manage_role              = true,
-  $roles                    = $::os_service_default,
-  $keystone_interface       = 'public'
 ) {
 
   include ::magnum::deps
@@ -118,6 +124,7 @@ class magnum::keystone::domain (
     'trust/trustee_domain_admin_password':     value => $domain_password, secret => true;
     'trust/roles':                             value => $roles;
     'trust/trustee_keystone_interface':        value => $keystone_interface;
+    'trust/trustee_keystone_region_name':      value => $keystone_region_name;
   }
 
 }
diff --git a/releasenotes/notes/keystone-region-name-aadb659d8a2c00f1.yaml b/releasenotes/notes/keystone-region-name-aadb659d8a2c00f1.yaml
new file mode 100644
index 0000000..7fba6cd
--- /dev/null
+++ b/releasenotes/notes/keystone-region-name-aadb659d8a2c00f1.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added keystone_region_name parameter to magnum::keystone::domain class.
diff --git a/spec/classes/magnum_keystone_domain_spec.rb b/spec/classes/magnum_keystone_domain_spec.rb
index 62149f6..a761f1d 100644
--- a/spec/classes/magnum_keystone_domain_spec.rb
+++ b/spec/classes/magnum_keystone_domain_spec.rb
@@ -13,7 +13,8 @@ describe 'magnum::keystone::domain' do
     :domain_admin_email       => 'magnum_admin@localhost',
     :domain_password          => 'domain_passwd',
     :roles                    => 'admin,',
-    :keystone_interface       => 'public'
+    :keystone_interface       => 'public',
+    :keystone_region_name     => 'RegionOne'
     }
   end
 
@@ -30,6 +31,7 @@ describe 'magnum::keystone::domain' do
       is_expected.to contain_magnum_config('trust/trustee_domain_id').with_value(params[:domain_id])
       is_expected.to contain_magnum_config('trust/roles').with_value(params[:roles])
       is_expected.to contain_magnum_config('trust/trustee_keystone_interface').with_value(params[:keystone_interface])
+      is_expected.to contain_magnum_config('trust/trustee_keystone_region_name').with_value(params[:keystone_region_name])
     end
 
     it 'should create keystone domain' do