openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Get rid of deprecated is_array method" into stable/wallaby

This commit is contained in:
Zuul 2021-08-24 09:47:28 +00:00 committed by Gerrit Code Review
parent febbc382fd 4b5e10094d
commit 8ba26cfbd0
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -478,12 +478,8 @@ will be removed in a future release.')
transport_url => $notification_transport_url,
}
if ! is_service_default ($service_plugins) and ($service_plugins) {
if is_array($service_plugins) {
neutron_config { 'DEFAULT/service_plugins': value => join($service_plugins, ',') }
} else {
fail('service_plugins should be an array.')
}
neutron_config {
'DEFAULT/service_plugins': value => join(any2array($service_plugins), ',')
}
oslo::messaging::rabbit {'neutron_config':

5
spec/classes/neutron_init_spec.rb
View File

@ -321,7 +321,9 @@ describe 'neutron' do
end
shared_examples 'without service_plugins' do
it { should_not contain_neutron_config('DEFAULT/service_plugins') }
it do
should contain_neutron_config('DEFAULT/service_plugins').with_value('<SERVICE DEFAULT>')
end
end
shared_examples 'with service_plugins' do
@ -334,7 +336,6 @@ describe 'neutron' do
it do
should contain_neutron_config('DEFAULT/service_plugins').with_value('router,firewall,vpnaas,metering,qos')
end
end
shared_examples 'with global_physnet_mtu defined' do