From 894f325e25121250518c854fcf89d407a6673e3a Mon Sep 17 00:00:00 2001 From: Harry Rybacki Date: Fri, 6 Oct 2017 10:57:55 -0400 Subject: [PATCH] Configure *_domain_name to Default by default Keystone v2.0 API was removed so we have no choice but configuring user_domain_name and project_domain_name otherwise it fallbacks to Keystone v2.0 and it fails. This patch sets the default value so we make sure Keystone v3 will be used out of the box for our users. Change-Id: I3291b3176dd818641c90a17150a06e640b119fa2 --- manifests/keystone/authtoken.pp | 8 ++++---- releasenotes/notes/default-domain-ef6bd3e929f3ee74.yaml | 7 +++++++ spec/classes/sahara_keystone_authtoken_spec.rb | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/default-domain-ef6bd3e929f3ee74.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index fb68d330..ca8d0b5e 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -22,11 +22,11 @@ # # [*user_domain_name*] # (Optional) Name of domain for $username -# Defaults to $::os_service_default +# Defaults to 'Default' # # [*project_domain_name*] # (Optional) Name of domain for $project_name -# Defaults to $::os_service_default +# Defaults to 'Default' # # [*insecure*] # (Optional) If true, explicitly allow TLS without checking server cert @@ -192,8 +192,8 @@ class sahara::keystone::authtoken( $password = $::os_service_default, $auth_url = 'http://127.0.0.1:35357/', $project_name = 'services', - $user_domain_name = $::os_service_default, - $project_domain_name = $::os_service_default, + $user_domain_name = 'Default', + $project_domain_name = 'Default', $insecure = $::os_service_default, $auth_section = $::os_service_default, $auth_type = 'password', diff --git a/releasenotes/notes/default-domain-ef6bd3e929f3ee74.yaml b/releasenotes/notes/default-domain-ef6bd3e929f3ee74.yaml new file mode 100644 index 00000000..c554c06f --- /dev/null +++ b/releasenotes/notes/default-domain-ef6bd3e929f3ee74.yaml @@ -0,0 +1,7 @@ +--- +issues: + - | + Keystone v2.0 API was removed so we need to set a default value + for user_domain_name and project_domain name, which will be + Default as it is already in some other classes in modules. + diff --git a/spec/classes/sahara_keystone_authtoken_spec.rb b/spec/classes/sahara_keystone_authtoken_spec.rb index ba657549..98908619 100644 --- a/spec/classes/sahara_keystone_authtoken_spec.rb +++ b/spec/classes/sahara_keystone_authtoken_spec.rb @@ -15,8 +15,8 @@ describe 'sahara::keystone::authtoken' do is_expected.to contain_sahara_config('keystone_authtoken/password').with_value('sahara_password') is_expected.to contain_sahara_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/') is_expected.to contain_sahara_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_sahara_config('keystone_authtoken/user_domain_name').with_value('') - is_expected.to contain_sahara_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/user_domain_name').with_value('Default') + is_expected.to contain_sahara_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_sahara_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_sahara_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_sahara_config('keystone_authtoken/auth_type').with_value('password')