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: I9ae04aa57983e60bd902f20a61a91cf1cfbd9c1c
This commit is contained in:
parent
9c024743c7
commit
7c15fd5d0f
|
@ -21,11 +21,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
|
||||
|
@ -182,8 +182,8 @@ class glare::keystone::authtoken(
|
|||
$username = 'glare',
|
||||
$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',
|
||||
|
|
|
@ -15,8 +15,8 @@ describe 'glare::keystone::authtoken' do
|
|||
is_expected.to contain_glare_config('keystone_authtoken/password').with_value('secrete')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_glare_config('keystone_authtoken/auth_type').with_value('password')
|
||||
|
|
Loading…
Reference in New Issue