openstack/puppet-neutron
Code Issues Proposed changes

Accept an array value for valid_interfaces

Browse Source 
The valid_interfaces parameter is defined as a ListOpt and accepts
a string value which represents a list.
This change allows passing an array value in addition to a string value
so that the list can be defined more flexibly.

Change-Id: Idfd6879e36a0a16d0d07f4296f99cbba0ad953d9
This commit is contained in:
Takashi Kajinami
2021-11-01 19:46:20 +09:00
parent dc2bdfd72c
commit bf562b889d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/server/notifications/ironic.pp
View File

@@ -84,7 +84,7 @@ class neutron::server::notifications::ironic (
'ironic/user_domain_name': value => $user_domain_name; 'ironic/user_domain_name': value => $user_domain_name;
'ironic/region_name': value => $region_name; 'ironic/region_name': value => $region_name;
'ironic/auth_type': value => $auth_type; 'ironic/auth_type': value => $auth_type;
'ironic/valid_interfaces': value => $valid_interfaces; 'ironic/valid_interfaces': value => join(any2array($valid_interfaces), ',');
'ironic/enable_notifications': value => $enable_notifications; 'ironic/enable_notifications': value => $enable_notifications;
} }
} }

15
spec/classes/neutron_server_notifications_ironic_spec.rb
View File

@@ -50,7 +50,7 @@ describe 'neutron::server::notifications::ironic' do
:region_name => 'MyRegion', :region_name => 'MyRegion',
:project_domain_name => 'Default_1', :project_domain_name => 'Default_1',
:user_domain_name => 'Default_2', :user_domain_name => 'Default_2',
:valid_interfaces => 'internal', :valid_interfaces => 'internal,public',
:enable_notifications => false, :enable_notifications => false,
) )
end end
@@ -63,11 +63,22 @@ describe 'neutron::server::notifications::ironic' do
should contain_neutron_config('ironic/region_name').with_value('MyRegion') should contain_neutron_config('ironic/region_name').with_value('MyRegion')
should contain_neutron_config('ironic/project_domain_name').with_value('Default_1') should contain_neutron_config('ironic/project_domain_name').with_value('Default_1')
should contain_neutron_config('ironic/user_domain_name').with_value('Default_2') should contain_neutron_config('ironic/user_domain_name').with_value('Default_2')
should contain_neutron_config('ironic/valid_interfaces').with_value('internal') should contain_neutron_config('ironic/valid_interfaces').with_value('internal,public')
should contain_neutron_config('ironic/enable_notifications').with_value(false) should contain_neutron_config('ironic/enable_notifications').with_value(false)
end end
end end
context 'when valid_interfaces is an array' do
before :each do
params.merge!(
:valid_interfaces => ['internal', 'public']
)
end
it 'should configure the valid_interfaces parameter with a commma-separated string' do
should contain_neutron_config('ironic/valid_interfaces').with_value('internal,public')
end
end
end end
on_supported_os({ on_supported_os({