From 7a4fb04a42604230b42ca1fec2a8a749d43e92e2 Mon Sep 17 00:00:00 2001 From: Daniel Abad Date: Tue, 18 Sep 2018 14:10:23 +0200 Subject: [PATCH] Add missing endpoint_override params After merging https://review.openstack.org/#/c/602070/ the endpoint_override param was missing in cinder, glance, neutron and swift config sections. Change-Id: Ic2f720ca50671a34f00ed7d5c118b897f795f046 --- manifests/cinder.pp | 6 ++++++ manifests/glance.pp | 6 ++++++ manifests/neutron.pp | 6 ++++++ manifests/swift.pp | 6 ++++++ spec/classes/ironic_cinder_spec.rb | 3 +++ spec/classes/ironic_glance_spec.rb | 7 ++++++- spec/classes/ironic_neutron_spec.rb | 3 +++ spec/classes/ironic_swift_spec.rb | 3 +++ 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/manifests/cinder.pp b/manifests/cinder.pp index dc6465ff..7b64f2f4 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.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::cinder ( $auth_type = 'password', $auth_url = $::os_service_default, @@ -48,6 +52,7 @@ class ironic::cinder ( $password = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', + $endpoint_override = $::os_service_default, ) { ironic_config { @@ -58,5 +63,6 @@ class ironic::cinder ( 'cinder/project_name': value => $project_name; 'cinder/user_domain_name': value => $user_domain_name; 'cinder/project_domain_name': value => $project_domain_name; + 'cinder/endpoint_override': value => $endpoint_override; } } diff --git a/manifests/glance.pp b/manifests/glance.pp index 5f586ff7..02de18cb 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -85,6 +85,10 @@ # valid for. # Defaults to $::os_service_default # +# [*endpoint_override*] +# The endpoint URL for requests for this client +# Defaults to $::os_service_default +# class ironic::glance ( $auth_type = 'password', $auth_url = $::os_service_default, @@ -102,6 +106,7 @@ class ironic::glance ( $swift_temp_url_key = $::os_service_default, $swift_temp_url_duration = $::os_service_default, $swift_account_project_name = undef, + $endpoint_override = $::os_service_default, ) { if is_array($api_servers) { @@ -129,6 +134,7 @@ class ironic::glance ( 'glance/swift_endpoint_url': value => $swift_endpoint_url; 'glance/swift_temp_url_key': value => $swift_temp_url_key, secret => true; 'glance/swift_temp_url_duration': value => $swift_temp_url_duration; + 'glance/endpoint_override': value => $endpoint_override; } if $swift_account_project_name { diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 1b9c8fec..e07cba81 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -44,6 +44,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::neutron ( $api_endpoint = $::os_service_default, $auth_type = 'password', @@ -53,6 +57,7 @@ class ironic::neutron ( $password = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', + $endpoint_override = $::os_service_default, ) { ironic_config { @@ -64,5 +69,6 @@ class ironic::neutron ( 'neutron/project_name': value => $project_name; 'neutron/user_domain_name': value => $user_domain_name; 'neutron/project_domain_name': value => $project_domain_name; + 'neutron/endpoint_override': value => $endpoint_override; } } diff --git a/manifests/swift.pp b/manifests/swift.pp index 08205ee3..d8da0578 100644 --- a/manifests/swift.pp +++ b/manifests/swift.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::swift ( $auth_type = 'password', $auth_url = $::os_service_default, @@ -48,6 +52,7 @@ class ironic::swift ( $password = $::os_service_default, $user_domain_name = 'Default', $project_domain_name = 'Default', + $endpoint_override = $::os_service_default, ) { ironic_config { @@ -58,5 +63,6 @@ class ironic::swift ( 'swift/project_name': value => $project_name; 'swift/user_domain_name': value => $user_domain_name; 'swift/project_domain_name': value => $project_domain_name; + 'swift/endpoint_override': value => $endpoint_override; } } diff --git a/spec/classes/ironic_cinder_spec.rb b/spec/classes/ironic_cinder_spec.rb index 7781f30e..d32dfe7c 100644 --- a/spec/classes/ironic_cinder_spec.rb +++ b/spec/classes/ironic_cinder_spec.rb @@ -41,6 +41,7 @@ describe 'ironic::cinder' do is_expected.to contain_ironic_config('cinder/password').with_value('').with_secret(true) is_expected.to contain_ironic_config('cinder/user_domain_name').with_value('Default') is_expected.to contain_ironic_config('cinder/project_domain_name').with_value('Default') + is_expected.to contain_ironic_config('cinder/endpoint_override').with_value('') end context 'when overriding parameters' do @@ -53,6 +54,7 @@ describe 'ironic::cinder' do :password => 'pa$$w0rd', :user_domain_name => 'NonDefault', :project_domain_name => 'NonDefault', + :endpoint_override => 'http://example2.com', ) end @@ -64,6 +66,7 @@ describe 'ironic::cinder' do is_expected.to contain_ironic_config('cinder/password').with_value(p[:password]).with_secret(true) is_expected.to contain_ironic_config('cinder/user_domain_name').with_value(p[:user_domain_name]) is_expected.to contain_ironic_config('cinder/project_domain_name').with_value(p[:project_domain_name]) + is_expected.to contain_ironic_config('cinder/endpoint_override').with_value(p[:endpoint_override]) end end diff --git a/spec/classes/ironic_glance_spec.rb b/spec/classes/ironic_glance_spec.rb index 9ec0e9d7..32bb0ebb 100644 --- a/spec/classes/ironic_glance_spec.rb +++ b/spec/classes/ironic_glance_spec.rb @@ -49,6 +49,7 @@ describe 'ironic::glance' do is_expected.to contain_ironic_config('glance/swift_endpoint_url').with(:value => '') is_expected.to contain_ironic_config('glance/swift_temp_url_key').with(:value => '').with_secret(true) is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with(:value => '') + is_expected.to contain_ironic_config('glance/endpoint_override').with_value('') end context 'when overriding parameters' do @@ -69,6 +70,7 @@ describe 'ironic::glance' do :swift_endpoint_url => 'http://example2.com', :swift_temp_url_key => 'the-key', :swift_temp_url_duration => 3600, + :endpoint_override => 'http://example2.com', ) end @@ -88,6 +90,7 @@ describe 'ironic::glance' do is_expected.to contain_ironic_config('glance/swift_endpoint_url').with_value(p[:swift_endpoint_url]) is_expected.to contain_ironic_config('glance/swift_temp_url_key').with_value(p[:swift_temp_url_key]).with_secret(true) is_expected.to contain_ironic_config('glance/swift_temp_url_duration').with_value(p[:swift_temp_url_duration]) + is_expected.to contain_ironic_config('glance/endpoint_override').with_value(p[:endpoint_override]) end end @@ -103,7 +106,8 @@ describe 'ironic::glance' do :project_domain_name => 'NonDefault', :api_servers => ['10.0.0.1:9292','10.0.0.2:9292'], :api_insecure => true, - :num_retries => 42 + :num_retries => 42, + :endpoint_override => 'http://example2.com', ) end @@ -118,6 +122,7 @@ describe 'ironic::glance' do is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(p[:api_servers].join(',')) is_expected.to contain_ironic_config('glance/glance_api_insecure').with_value(p[:api_insecure]) is_expected.to contain_ironic_config('glance/glance_num_retries').with_value(p[:num_retries]) + is_expected.to contain_ironic_config('glance/endpoint_override').with_value(p[:endpoint_override]) end end diff --git a/spec/classes/ironic_neutron_spec.rb b/spec/classes/ironic_neutron_spec.rb index 2839f1a7..7a9342df 100644 --- a/spec/classes/ironic_neutron_spec.rb +++ b/spec/classes/ironic_neutron_spec.rb @@ -42,6 +42,7 @@ describe 'ironic::neutron' do is_expected.to contain_ironic_config('neutron/password').with_value('').with_secret(true) is_expected.to contain_ironic_config('neutron/user_domain_name').with_value('Default') is_expected.to contain_ironic_config('neutron/project_domain_name').with_value('Default') + is_expected.to contain_ironic_config('neutron/endpoint_override').with_value('') end context 'when overriding parameters' do @@ -55,6 +56,7 @@ describe 'ironic::neutron' do :password => 'pa$$w0rd', :user_domain_name => 'NonDefault', :project_domain_name => 'NonDefault', + :endpoint_override => 'http://example2.com', ) end @@ -67,6 +69,7 @@ describe 'ironic::neutron' do is_expected.to contain_ironic_config('neutron/password').with_value(p[:password]).with_secret(true) is_expected.to contain_ironic_config('neutron/user_domain_name').with_value(p[:user_domain_name]) is_expected.to contain_ironic_config('neutron/project_domain_name').with_value(p[:project_domain_name]) + is_expected.to contain_ironic_config('neutron/endpoint_override').with_value(p[:endpoint_override]) end end diff --git a/spec/classes/ironic_swift_spec.rb b/spec/classes/ironic_swift_spec.rb index 20cc5ac4..80e05e8a 100644 --- a/spec/classes/ironic_swift_spec.rb +++ b/spec/classes/ironic_swift_spec.rb @@ -41,6 +41,7 @@ describe 'ironic::swift' do is_expected.to contain_ironic_config('swift/password').with_value('').with_secret(true) is_expected.to contain_ironic_config('swift/user_domain_name').with_value('Default') is_expected.to contain_ironic_config('swift/project_domain_name').with_value('Default') + is_expected.to contain_ironic_config('swift/endpoint_override').with_value('') end context 'when overriding parameters' do @@ -53,6 +54,7 @@ describe 'ironic::swift' do :password => 'pa$$w0rd', :user_domain_name => 'NonDefault', :project_domain_name => 'NonDefault', + :endpoint_override => 'http://example2.com', ) end @@ -64,6 +66,7 @@ describe 'ironic::swift' do is_expected.to contain_ironic_config('swift/password').with_value(p[:password]).with_secret(true) is_expected.to contain_ironic_config('swift/user_domain_name').with_value(p[:user_domain_name]) is_expected.to contain_ironic_config('swift/project_domain_name').with_value(p[:project_domain_name]) + is_expected.to contain_ironic_config('swift/endpoint_override').with_value(p[:endpoint_override]) end end