openstack/puppet-openstack-cookiecutter
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: Icaac286dc98d4df6146b5124dc66b703c8e5086a
This commit is contained in:
ZhongShengping 2017-10-13 14:39:00 +08:00
parent a63251cbe5
commit 4cbb48893e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet-{{cookiecutter.project_name}}/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 {{cookiecutter.project_name}}::keystone::authtoken(
$username = '{{cookiecutter.project_name}}',
$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
puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb
View File

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