Add region_name parameter to ironic::drivers::inspector

... so that operator can specify their customized region where actual
keystone identity resources are created.

Change-Id: I1e5db37da6ac4f981226bb69942002af8ef465d6
This commit is contained in:
Takashi Kajinami 2020-04-18 22:23:30 +09:00
parent fc1b216dc7
commit 06547f81a9
3 changed files with 15 additions and 0 deletions

View File

@ -42,6 +42,11 @@
# The name of project's domain (required for Identity V3).
# Defaults to 'Default'
#
# [*region_name*]
# (optional) Region name for connecting to ironic-inspector in admin context
# 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
@ -72,6 +77,7 @@ class ironic::drivers::inspector (
$password = $::os_service_default,
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$region_name = $::os_service_default,
$endpoint_override = $::os_service_default,
$callback_endpoint_override = $::os_service_default,
$power_off = $::os_service_default,
@ -95,6 +101,7 @@ has no effect. Please use ironic::drivers::inspector::endpoint_override instead.
'inspector/project_name': value => $project_name;
'inspector/user_domain_name': value => $user_domain_name;
'inspector/project_domain_name': value => $project_domain_name;
'inspector/region_name': value => $region_name;
'inspector/endpoint_override': value => $endpoint_override;
'inspector/callback_endpoint_override': value => $callback_endpoint_override;
'inspector/power_off': value => $power_off;

View File

@ -0,0 +1,5 @@
---
features:
- |
The ``ironic::drivers::inspector::region_name`` was added so that operatos
can specify the keystone region where identity resources are created.

View File

@ -41,6 +41,7 @@ describe 'ironic::drivers::inspector' do
is_expected.to contain_ironic_config('inspector/password').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_ironic_config('inspector/user_domain_name').with_value('Default')
is_expected.to contain_ironic_config('inspector/project_domain_name').with_value('Default')
is_expected.to contain_ironic_config('inspector/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('inspector/endpoint_override').with_value('<SERVICE DEFAULT>')
end
@ -54,6 +55,7 @@ describe 'ironic::drivers::inspector' do
:password => 'pa$$w0rd',
:user_domain_name => 'NonDefault',
:project_domain_name => 'NonDefault',
:region_name => 'regionTwo',
:endpoint_override => 'http://example2.com',
:callback_endpoint_override => 'http://10.0.0.1/v1/continue',
:power_off => false,
@ -69,6 +71,7 @@ describe 'ironic::drivers::inspector' do
is_expected.to contain_ironic_config('inspector/password').with_value(p[:password]).with_secret(true)
is_expected.to contain_ironic_config('inspector/user_domain_name').with_value(p[:user_domain_name])
is_expected.to contain_ironic_config('inspector/project_domain_name').with_value(p[:project_domain_name])
is_expected.to contain_ironic_config('inspector/region_name').with_value(p[:region_name])
is_expected.to contain_ironic_config('inspector/endpoint_override').with_value(p[:endpoint_override])
is_expected.to contain_ironic_config('inspector/callback_endpoint_override').with_value(p[:callback_endpoint_override])
is_expected.to contain_ironic_config('inspector/power_off').with_value(p[:power_off])