openstack
/
puppet-ironic
Code Issues Proposed changes

Add region_name to ironic::service_catalog 

... because it was missed in the previous change[1] to make region_name
configurable.

[1] edfe3e5460

Change-Id: Icd939144dc178adee734900b9f7049f2c5674f45
This commit is contained in:
Takashi Kajinami 2020-04-13 14:55:00 +09:00
parent b3a86860f1
commit 820d731731
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/service_catalog.pp
View File

@ -40,6 +40,11 @@
# The name of project's domain (required for Identity V3).
# Defaults to 'Default'
#
# [*region_name*]
# (optional) Region name for accessing Keystone catalog
# through the OpenStack Identity service.
# Defaults to $::os_service_default
#
# [*endpoint_override*]
# The endpoint URL for requests for this client
# Defaults to $::os_service_default
@ -52,6 +57,7 @@ class ironic::service_catalog (
$password = $::os_service_default,
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$region_name = $::os_service_default,
$endpoint_override = $::os_service_default,
) {
@ -65,6 +71,7 @@ class ironic::service_catalog (
'service_catalog/project_name': value => $project_name;
'service_catalog/user_domain_name': value => $user_domain_name;
'service_catalog/project_domain_name': value => $project_domain_name;
'service_catalog/region_name': value => $region_name;
'service_catalog/endpoint_override': value => $endpoint_override;
}
}

1
releasenotes/notes/keystone-region_name-6e25c084e4a0b711.yaml
View File

@ -8,3 +8,4 @@ features:
- ``ironic::glance::region_name``
- ``ironic::neutron::region_name``
- ``ironic::swift::region_name``
- ``ironic::service_catalog::region_name``

3
spec/classes/ironic_service_catalog_spec.rb
View File

@ -41,6 +41,7 @@ describe 'ironic::service_catalog' do
is_expected.to contain_ironic_config('service_catalog/password').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_ironic_config('service_catalog/user_domain_name').with_value('Default')
is_expected.to contain_ironic_config('service_catalog/project_domain_name').with_value('Default')
is_expected.to contain_ironic_config('service_catalog/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('service_catalog/endpoint_override').with_value('<SERVICE DEFAULT>')
end
@ -54,6 +55,7 @@ describe 'ironic::service_catalog' do
:password => 'pa$$w0rd',
:user_domain_name => 'NonDefault',
:project_domain_name => 'NonDefault',
:region_name => 'regionTwo',
:endpoint_override => 'http://example2.com',
)
end
@ -66,6 +68,7 @@ describe 'ironic::service_catalog' do
is_expected.to contain_ironic_config('service_catalog/password').with_value(p[:password]).with_secret(true)
is_expected.to contain_ironic_config('service_catalog/user_domain_name').with_value(p[:user_domain_name])
is_expected.to contain_ironic_config('service_catalog/project_domain_name').with_value(p[:project_domain_name])
is_expected.to contain_ironic_config('service_catalog/region_name').with_value(p[:region_name])
is_expected.to contain_ironic_config('service_catalog/endpoint_override').with_value(p[:endpoint_override])
end
end