openstack
/
puppet-barbican
Code Issues Proposed changes

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: I27631d4c6a81e7fa50b2f5154d87d0def8e3a875
Co-Authored-By: Harry Rybacki <hrybacki@redhat.com>
This commit is contained in:
Juan Antonio Osorio Robles 2017-10-06 16:04:14 +03:00
parent 836048b4f9
commit 9aa994c9a4
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
@ -192,8 +192,8 @@ class barbican::keystone::authtoken(
$username = 'barbican',
$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-9dfa58f4f4cfc425.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/barbican_keystone_authtoken_spec.rb
View File

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