From 8d1cd82411f8f683216707b6636a4bfe1d3381ae Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 15 Mar 2024 11:54:42 +0900 Subject: [PATCH] Remove redundant override of clients options Remove the redundant hard-coded defaults of some of the client options. The values currently used match the defaults in magnum itself. Change-Id: I93e9f2bee16020f7dd9176828600567520235237 --- manifests/clients.pp | 8 ++++---- spec/classes/magnum_clients_barbican_spec.rb | 2 +- spec/classes/magnum_clients_cinder_spec.rb | 4 ++-- spec/classes/magnum_clients_glance_spec.rb | 4 ++-- spec/classes/magnum_clients_heat_spec.rb | 4 ++-- spec/classes/magnum_clients_magnum_spec.rb | 2 +- spec/classes/magnum_clients_neutron_spec.rb | 4 ++-- spec/classes/magnum_clients_nova_spec.rb | 4 ++-- spec/classes/magnum_clients_octavia_spec.rb | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/manifests/clients.pp b/manifests/clients.pp index 7f22b54..717f94c 100644 --- a/manifests/clients.pp +++ b/manifests/clients.pp @@ -12,7 +12,7 @@ # [*endpoint_type*] # (optional) Type of endpoint in Identity service catalog to use for # communication with the OpenStack service. -# Defaults to publicURL +# Defaults to $facts['os_service_default'] # # [*ca_file*] # (optional) CA cert file to use in SSL connections. @@ -28,15 +28,15 @@ # # [*insecure*] # (optional) If set, then the server's certificate will not be verified. -# Defaults to false +# Defaults to $facts['os_service_default'] # class magnum::clients ( $region_name = 'RegionOne', - $endpoint_type = 'publicURL', + $endpoint_type = $facts['os_service_default'], $ca_file = $facts['os_service_default'], $cert_file = $facts['os_service_default'], $key_file = $facts['os_service_default'], - $insecure = false + $insecure = $facts['os_service_default'], ) { include magnum::deps include magnum::params diff --git a/spec/classes/magnum_clients_barbican_spec.rb b/spec/classes/magnum_clients_barbican_spec.rb index efc1e46..951bcc0 100644 --- a/spec/classes/magnum_clients_barbican_spec.rb +++ b/spec/classes/magnum_clients_barbican_spec.rb @@ -10,7 +10,7 @@ describe 'magnum::clients::barbican' do end it { is_expected.to contain_magnum_config('barbican_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('barbican_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('barbican_client/endpoint_type').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_cinder_spec.rb b/spec/classes/magnum_clients_cinder_spec.rb index 053ffb8..944ed54 100644 --- a/spec/classes/magnum_clients_cinder_spec.rb +++ b/spec/classes/magnum_clients_cinder_spec.rb @@ -10,11 +10,11 @@ describe 'magnum::clients::cinder' do end it { is_expected.to contain_magnum_config('cinder_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('cinder_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('cinder_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('cinder_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('cinder_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('cinder_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('cinder_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('cinder_client/insecure').with_value('') } it { is_expected.to contain_magnum_config('cinder_client/api_version').with_value('') } end diff --git a/spec/classes/magnum_clients_glance_spec.rb b/spec/classes/magnum_clients_glance_spec.rb index c8fef24..63ec176 100644 --- a/spec/classes/magnum_clients_glance_spec.rb +++ b/spec/classes/magnum_clients_glance_spec.rb @@ -10,12 +10,12 @@ describe 'magnum::clients::glance' do end it { is_expected.to contain_magnum_config('glance_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('glance_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('glance_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('glance_client/api_version').with_value('') } it { is_expected.to contain_magnum_config('glance_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('glance_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('glance_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('glance_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('glance_client/insecure').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_heat_spec.rb b/spec/classes/magnum_clients_heat_spec.rb index 3734c4d..b126552 100644 --- a/spec/classes/magnum_clients_heat_spec.rb +++ b/spec/classes/magnum_clients_heat_spec.rb @@ -10,12 +10,12 @@ describe 'magnum::clients::heat' do end it { is_expected.to contain_magnum_config('heat_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('heat_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('heat_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('heat_client/api_version').with_value('') } it { is_expected.to contain_magnum_config('heat_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('heat_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('heat_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('heat_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('heat_client/insecure').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_magnum_spec.rb b/spec/classes/magnum_clients_magnum_spec.rb index 6b5b098..6765e54 100644 --- a/spec/classes/magnum_clients_magnum_spec.rb +++ b/spec/classes/magnum_clients_magnum_spec.rb @@ -10,7 +10,7 @@ describe 'magnum::clients::magnum' do end it { is_expected.to contain_magnum_config('magnum_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('magnum_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('magnum_client/endpoint_type').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_neutron_spec.rb b/spec/classes/magnum_clients_neutron_spec.rb index cbfd302..66b46a1 100644 --- a/spec/classes/magnum_clients_neutron_spec.rb +++ b/spec/classes/magnum_clients_neutron_spec.rb @@ -10,11 +10,11 @@ describe 'magnum::clients::neutron' do end it { is_expected.to contain_magnum_config('neutron_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('neutron_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('neutron_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('neutron_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('neutron_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('neutron_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('neutron_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('neutron_client/insecure').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_nova_spec.rb b/spec/classes/magnum_clients_nova_spec.rb index 9ee3ccf..6b1399f 100644 --- a/spec/classes/magnum_clients_nova_spec.rb +++ b/spec/classes/magnum_clients_nova_spec.rb @@ -10,12 +10,12 @@ describe 'magnum::clients::nova' do end it { is_expected.to contain_magnum_config('nova_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('nova_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('nova_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('nova_client/api_version').with_value('') } it { is_expected.to contain_magnum_config('nova_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('nova_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('nova_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('nova_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('nova_client/insecure').with_value('') } end context 'with specific parameters' do diff --git a/spec/classes/magnum_clients_octavia_spec.rb b/spec/classes/magnum_clients_octavia_spec.rb index 77bdb8a..22a6919 100644 --- a/spec/classes/magnum_clients_octavia_spec.rb +++ b/spec/classes/magnum_clients_octavia_spec.rb @@ -10,11 +10,11 @@ describe 'magnum::clients::octavia' do end it { is_expected.to contain_magnum_config('octavia_client/region_name').with_value('RegionOne') } - it { is_expected.to contain_magnum_config('octavia_client/endpoint_type').with_value('publicURL') } + it { is_expected.to contain_magnum_config('octavia_client/endpoint_type').with_value('') } it { is_expected.to contain_magnum_config('octavia_client/ca_file').with_value('') } it { is_expected.to contain_magnum_config('octavia_client/cert_file').with_value('') } it { is_expected.to contain_magnum_config('octavia_client/key_file').with_value('') } - it { is_expected.to contain_magnum_config('octavia_client/insecure').with_value(false) } + it { is_expected.to contain_magnum_config('octavia_client/insecure').with_value('') } end context 'with specific parameters' do