From e73411d4ed7f802a168207c66e6731ceea30cb16 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 13 Oct 2017 14:50:36 +0800 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: I10ea974343681668c5936d26308506c8a58da17c --- manifests/keystone/authtoken.pp | 8 ++++---- releasenotes/notes/default_domain-b1fb03d5e12a9f7d.yaml | 6 ++++++ spec/classes/watcher_keystone_authtoken_spec.rb | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/default_domain-b1fb03d5e12a9f7d.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 991bdb7..9409ee4 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 @@ -194,8 +194,8 @@ class watcher::keystone::authtoken ( $username = 'watcher', $auth_url = 'http://localhost: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-b1fb03d5e12a9f7d.yaml b/releasenotes/notes/default_domain-b1fb03d5e12a9f7d.yaml new file mode 100644 index 0000000..7394505 --- /dev/null +++ b/releasenotes/notes/default_domain-b1fb03d5e12a9f7d.yaml @@ -0,0 +1,6 @@ +--- +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/watcher_keystone_authtoken_spec.rb b/spec/classes/watcher_keystone_authtoken_spec.rb index 62074f2..9b18725 100644 --- a/spec/classes/watcher_keystone_authtoken_spec.rb +++ b/spec/classes/watcher_keystone_authtoken_spec.rb @@ -19,8 +19,8 @@ describe 'watcher::keystone::authtoken' do is_expected.to contain_watcher_config('keystone_authtoken/password').with_value('watcher_password') is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') is_expected.to contain_watcher_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_watcher_config('keystone_authtoken/user_domain_name').with_value('') - is_expected.to contain_watcher_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_watcher_config('keystone_authtoken/user_domain_name').with_value('Default') + is_expected.to contain_watcher_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_watcher_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/auth_type').with_value('password')