openstack/puppet-watcher
Code Issues Proposed changes

Configure *_domain_name to Default by default

Browse Source 
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: I10ea974343681668c5936d26308506c8a58da17c
This commit is contained in:
ZhongShengping 2017-10-13 14:50:36 +08:00
parent 0c4b3bde4e
commit e73411d4ed
3 changed files with 12 additions and 6 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
@ -194,8 +194,8 @@ class watcher::keystone::authtoken (
$username = 'watcher',
$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',

6
releasenotes/notes/default_domain-b1fb03d5e12a9f7d.yaml Normal file
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.

4
spec/classes/watcher_keystone_authtoken_spec.rb
View File

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