openstack/puppet-ironic
Code Issues Proposed changes

Expose the endpoint_override parameter

Browse Source 
After the deprecation of the parameters "service_url" from
group "inspector" and "api_url" from group "conductor", we need
to expose the "endpoint_override" in groups "inspector" and
"service_catalog"

Change-Id: Iae5d8913f64665327024841c2af709bea3c25b49
This commit is contained in:
Daniel Abad 2018-09-12 17:43:25 +02:00
parent 29d2aa95d5
commit 38480756d7
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/drivers/inspector.pp
View File

@ -47,6 +47,10 @@
# The name of project's domain (required for Identity V3).
# Defaults to 'Default'
#
# [*endpoint_override*]
# The endpoint URL for requests for this client
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*enabled*]
@ -63,6 +67,7 @@ class ironic::drivers::inspector (
$password = $::os_service_default,
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$endpoint_override = $::os_service_default,
# DEPRECATED PARAMETERS
$enabled = undef,
) {
@ -83,5 +88,6 @@ Please use ironic::drivers::hardware_interfaces::enabled_inspect_interfaces inst
'inspector/project_name': value => $project_name;
'inspector/user_domain_name': value => $user_domain_name;
'inspector/project_domain_name': value => $project_domain_name;
'inspector/endpoint_override': value => $endpoint_override;
}
}

6
manifests/service_catalog.pp
View File

@ -40,6 +40,10 @@
# The name of project's domain (required for Identity V3).
# Defaults to 'Default'
#
# [*endpoint_override*]
# The endpoint URL for requests for this client
# Defaults to $::os_service_default
#
class ironic::service_catalog (
$auth_type = 'password',
$auth_url = $::os_service_default,
@ -48,6 +52,7 @@ class ironic::service_catalog (
$password = $::os_service_default,
$user_domain_name = 'Default',
$project_domain_name = 'Default',
$endpoint_override = $::os_service_default,
) {
include ::ironic::deps
@ -60,5 +65,6 @@ 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/endpoint_override': value => $endpoint_override;
}
}

6
releasenotes/notes/add-endpoint-override-ed2a335077e5fc24.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Expose the ``endpoint_override`` parameter in both
``::ironic::drivers::inspector`` and ``::ironic::service_catalog``

3
spec/classes/ironic_drivers_inspector_spec.rb
View File

@ -42,6 +42,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/endpoint_override').with_value('<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -55,6 +56,7 @@ describe 'ironic::drivers::inspector' do
:password => 'pa$$w0rd',
:user_domain_name => 'NonDefault',
:project_domain_name => 'NonDefault',
:endpoint_override => 'http://example2.com',
)
end
@ -67,6 +69,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/endpoint_override').with_value(p[:endpoint_override])
end
end

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/endpoint_override').with_value('<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -53,6 +54,7 @@ describe 'ironic::service_catalog' do
:password => 'pa$$w0rd',
:user_domain_name => 'NonDefault',
:project_domain_name => 'NonDefault',
:endpoint_override => 'http://example2.com',
)
end
@ -64,6 +66,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/endpoint_override').with_value(p[:endpoint_override])
end
end