From e9922a82a78ab9bd8d43d1c7bd5625f85f828fd6 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Thu, 16 Feb 2017 08:50:50 -0500 Subject: [PATCH] Set the user and domain name to default Change-Id: I2619293f3cc6363d1edaa791a8672424cdc76aed --- manifests/keystone/authtoken.pp | 4 ++-- .../notes/set-user-domain-default-3da3f24dfe35e9c0.yaml | 3 +++ spec/classes/panko_keystone_authtoken_spec.rb | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/set-user-domain-default-3da3f24dfe35e9c0.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 07d5dd8..97ce916 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -194,8 +194,8 @@ class panko::keystone::authtoken( $username = 'panko', $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/set-user-domain-default-3da3f24dfe35e9c0.yaml b/releasenotes/notes/set-user-domain-default-3da3f24dfe35e9c0.yaml new file mode 100644 index 0000000..9ce26bd --- /dev/null +++ b/releasenotes/notes/set-user-domain-default-3da3f24dfe35e9c0.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Set the default user and domain name to Default diff --git a/spec/classes/panko_keystone_authtoken_spec.rb b/spec/classes/panko_keystone_authtoken_spec.rb index d7d32f2..ff6da73 100644 --- a/spec/classes/panko_keystone_authtoken_spec.rb +++ b/spec/classes/panko_keystone_authtoken_spec.rb @@ -15,8 +15,8 @@ describe 'panko::keystone::authtoken' do is_expected.to contain_panko_config('keystone_authtoken/password').with_value('secrete') is_expected.to contain_panko_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') is_expected.to contain_panko_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_panko_config('keystone_authtoken/user_domain_name').with_value('') - is_expected.to contain_panko_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_panko_config('keystone_authtoken/user_domain_name').with_value('Default') + is_expected.to contain_panko_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_panko_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_panko_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_panko_config('keystone_authtoken/auth_type').with_value('password')