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: I6d050a723a103719ee0b018e0012f5362edb3cbd
This commit is contained in:
ZhongShengping 2017-10-13 14:40:49 +08:00
parent 3f53b0c1db
commit d3ea616134
3 changed files with 12 additions and 6 deletions

View File

@ -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
@ -191,8 +191,8 @@ class tacker::keystone::authtoken(
$username = 'tacker',
$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',

View File

@ -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.

View File

@ -20,8 +20,8 @@ describe 'tacker::keystone::authtoken' do
is_expected.to contain_tacker_config('keystone_authtoken/password').with_value('tacker_password')
is_expected.to contain_tacker_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
is_expected.to contain_tacker_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_tacker_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_tacker_config('keystone_authtoken/project_domain_name').with_value('Default')
is_expected.to contain_tacker_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tacker_config('keystone_authtoken/auth_type').with_value('password')