Browse Source

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: I6949b5e00ec26ddc66cbe08de7420468d6b34954
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
changes/14/510114/1
Harry Rybacki 5 years ago
parent
commit
ead9b82454
  1. 8
      manifests/keystone/authtoken.pp
  2. 7
      releasenotes/notes/default-domain-185c103320f29f94.yaml
  3. 4
      spec/classes/ceilometer_keystone_authtoken_spec.rb

8
manifests/keystone/authtoken.pp

@ -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 ceilometer::keystone::authtoken(
$password = $::os_service_default,
$auth_url = 'http://127.0.0.1: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',

7
releasenotes/notes/default-domain-185c103320f29f94.yaml

@ -0,0 +1,7 @@
---
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/ceilometer_keystone_authtoken_spec.rb

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

Loading…
Cancel
Save