openstack/puppet-zaqar
Code Issues Proposed changes

Set *_domain_name vars to 'Default' by default

Browse Source 
Keystone v2 api's are removed in [1], so it's required
to set user_domain_name and project_domain_name otherwise
all requests fallbacks to keystone v2.0 and fails.

[1] https://review.openstack.org/#/c/499783/

Change-Id: Id3737874408887900e1d8b6b87758f64469892b0
This commit is contained in:
yatin 2017-10-06 10:41:45 +05:30
parent 27baa5f00e
commit 5691df168e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/keystone/authtoken.pp
View File

@ -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
@ -192,8 +192,8 @@ class zaqar::keystone::authtoken(
$password = $::os_service_default,
$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',

4
manifests/keystone/trust.pp
View File

@ -18,7 +18,7 @@
#
# [*user_domain_name*]
# (Optional) Name of domain for $username
# Defaults to $::os_service_default
# Defaults to 'Default'
#
# [*auth_section*]
# (Optional) Config Section from which to load plugin specific options
@ -32,7 +32,7 @@ class zaqar::keystone::trust(
$username = 'zaqar',
$password = $::os_service_default,
$auth_url = 'http://localhost:35357',
$user_domain_name = $::os_service_default,
$user_domain_name = 'Default',
$auth_section = $::os_service_default,
$auth_type = 'password',
) {

4
spec/classes/zaqar_keystone_authtoken_spec.rb
View File

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