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: I722d3d730a57a2106b1e9db99020c475bdd15fb5
This commit is contained in:
parent
7fd74fc141
commit
d57cecf1c4
|
@ -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 vitrage::keystone::authtoken(
|
|||
$username = 'vitrage',
|
||||
$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',
|
||||
|
|
|
@ -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.
|
|
@ -20,8 +20,8 @@ describe 'vitrage::keystone::authtoken' do
|
|||
is_expected.to contain_vitrage_config('keystone_authtoken/password').with_value('vitrage_password')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_vitrage_config('keystone_authtoken/auth_type').with_value('password')
|
||||
|
|
Loading…
Reference in New Issue