openstack
/
puppet-magnum
Code Issues Proposed changes

Merge "Remove redundant override of clients options"

This commit is contained in:
Zuul 2024-03-26 12:22:56 +00:00 committed by Gerrit Code Review
parent 3fc001aa29 8d1cd82411
commit 378ad7beb5
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/clients.pp
View File

@ -12,7 +12,7 @@
# [*endpoint_type*] # [*endpoint_type*]
# (optional) Type of endpoint in Identity service catalog to use for # (optional) Type of endpoint in Identity service catalog to use for
# communication with the OpenStack service. # communication with the OpenStack service.
# Defaults to publicURL # Defaults to $facts['os_service_default']
# #
# [*ca_file*] # [*ca_file*]
# (optional) CA cert file to use in SSL connections. # (optional) CA cert file to use in SSL connections.
@ -28,15 +28,15 @@
# #
# [*insecure*] # [*insecure*]
# (optional) If set, then the server's certificate will not be verified. # (optional) If set, then the server's certificate will not be verified.
# Defaults to false # Defaults to $facts['os_service_default']
# #
class magnum::clients ( class magnum::clients (
$region_name = 'RegionOne', $region_name = 'RegionOne',
$endpoint_type = 'publicURL', $endpoint_type = $facts['os_service_default'],
$ca_file = $facts['os_service_default'], $ca_file = $facts['os_service_default'],
$cert_file = $facts['os_service_default'], $cert_file = $facts['os_service_default'],
$key_file = $facts['os_service_default'], $key_file = $facts['os_service_default'],
$insecure = false $insecure = $facts['os_service_default'],
) { ) {
include magnum::deps include magnum::deps
include magnum::params include magnum::params

2
spec/classes/magnum_clients_barbican_spec.rb
View File

@ -10,7 +10,7 @@ describe 'magnum::clients::barbican' do
end end
it { is_expected.to contain_magnum_config('barbican_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

4
spec/classes/magnum_clients_cinder_spec.rb
View File

@ -10,11 +10,11 @@ describe 'magnum::clients::cinder' do
end end
it { is_expected.to contain_magnum_config('cinder_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('cinder_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('cinder_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('cinder_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('cinder_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('cinder_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('cinder_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('cinder_client/api_version').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('cinder_client/api_version').with_value('<SERVICE DEFAULT>') }
end end

4
spec/classes/magnum_clients_glance_spec.rb
View File

@ -10,12 +10,12 @@ describe 'magnum::clients::glance' do
end end
it { is_expected.to contain_magnum_config('glance_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('glance_client/api_version').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('glance_client/api_version').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('glance_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('glance_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('glance_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('glance_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('glance_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('glance_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

4
spec/classes/magnum_clients_heat_spec.rb
View File

@ -10,12 +10,12 @@ describe 'magnum::clients::heat' do
end end
it { is_expected.to contain_magnum_config('heat_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('heat_client/api_version').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('heat_client/api_version').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('heat_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('heat_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('heat_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('heat_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('heat_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('heat_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

2
spec/classes/magnum_clients_magnum_spec.rb
View File

@ -10,7 +10,7 @@ describe 'magnum::clients::magnum' do
end end
it { is_expected.to contain_magnum_config('magnum_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

4
spec/classes/magnum_clients_neutron_spec.rb
View File

@ -10,11 +10,11 @@ describe 'magnum::clients::neutron' do
end end
it { is_expected.to contain_magnum_config('neutron_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('neutron_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('neutron_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('neutron_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('neutron_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('neutron_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('neutron_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

4
spec/classes/magnum_clients_nova_spec.rb
View File

@ -10,12 +10,12 @@ describe 'magnum::clients::nova' do
end end
it { is_expected.to contain_magnum_config('nova_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('nova_client/api_version').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('nova_client/api_version').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('nova_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('nova_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('nova_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('nova_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('nova_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('nova_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do

4
spec/classes/magnum_clients_octavia_spec.rb
View File

@ -10,11 +10,11 @@ describe 'magnum::clients::octavia' do
end end
it { is_expected.to contain_magnum_config('octavia_client/region_name').with_value('RegionOne') } 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('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('octavia_client/ca_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('octavia_client/ca_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('octavia_client/cert_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('octavia_client/cert_file').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_magnum_config('octavia_client/key_file').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_magnum_config('octavia_client/key_file').with_value('<SERVICE DEFAULT>') }
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('<SERVICE DEFAULT>') }
end end
context 'with specific parameters' do context 'with specific parameters' do