openstack
/
puppet-vitrage
Code Issues Proposed changes

Merge "Configure *_domain_name to Default by default" into stable/pike

This commit is contained in:
Zuul 2017-12-06 09:59:41 +00:00 committed by Gerrit Code Review
parent 314242caf1 7c26516871
commit 4ff14d4dc7
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

@ -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',

6
releasenotes/notes/default_domain-8403fba2483f6a63.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/vitrage_keystone_authtoken_spec.rb
View File

@ -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')