From 8758d098b6bff8d75208e794eafb29781341a420 Mon Sep 17 00:00:00 2001 From: Daniel Abad Date: Wed, 12 Sep 2018 17:43:25 +0200 Subject: [PATCH] Expose the endpoint_override parameter 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 (cherry picked from commit 38480756d7f84cd30f6df0549851398440aa0547) --- manifests/drivers/inspector.pp | 6 ++++++ manifests/service_catalog.pp | 6 ++++++ .../notes/add-endpoint-override-ed2a335077e5fc24.yaml | 6 ++++++ spec/classes/ironic_drivers_inspector_spec.rb | 3 +++ spec/classes/ironic_service_catalog_spec.rb | 3 +++ 5 files changed, 24 insertions(+) create mode 100644 releasenotes/notes/add-endpoint-override-ed2a335077e5fc24.yaml diff --git a/manifests/drivers/inspector.pp b/manifests/drivers/inspector.pp index 611b7ee7..daa943c8 100644 --- a/manifests/drivers/inspector.pp +++ b/manifests/drivers/inspector.pp @@ -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; } } diff --git a/manifests/service_catalog.pp b/manifests/service_catalog.pp index 838f990d..7035e247 100644 --- a/manifests/service_catalog.pp +++ b/manifests/service_catalog.pp @@ -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; } } diff --git a/releasenotes/notes/add-endpoint-override-ed2a335077e5fc24.yaml b/releasenotes/notes/add-endpoint-override-ed2a335077e5fc24.yaml new file mode 100644 index 00000000..ee41c319 --- /dev/null +++ b/releasenotes/notes/add-endpoint-override-ed2a335077e5fc24.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Expose the ``endpoint_override`` parameter in both + ``::ironic::drivers::inspector`` and ``::ironic::service_catalog`` + diff --git a/spec/classes/ironic_drivers_inspector_spec.rb b/spec/classes/ironic_drivers_inspector_spec.rb index 8ac5549a..5720e9da 100644 --- a/spec/classes/ironic_drivers_inspector_spec.rb +++ b/spec/classes/ironic_drivers_inspector_spec.rb @@ -42,6 +42,7 @@ describe 'ironic::drivers::inspector' do is_expected.to contain_ironic_config('inspector/password').with_value('').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('') 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 diff --git a/spec/classes/ironic_service_catalog_spec.rb b/spec/classes/ironic_service_catalog_spec.rb index f5bf845b..7204b812 100644 --- a/spec/classes/ironic_service_catalog_spec.rb +++ b/spec/classes/ironic_service_catalog_spec.rb @@ -41,6 +41,7 @@ describe 'ironic::service_catalog' do is_expected.to contain_ironic_config('service_catalog/password').with_value('').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('') 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