openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Correct the ovn option name for vhost socket directory"

This commit is contained in:
Zuul 2019-04-16 09:41:32 +00:00 committed by Gerrit Code Review
parent bfbef8b79d d0842b04e7
commit c3acf3ed0d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/plugins/ml2/ovn.pp
View File

@ -110,6 +110,6 @@ class neutron::plugins::ml2::ovn(
'ovn/ovn_metadata_enabled' : value => $ovn_metadata_enabled;
'ovn/enable_distributed_floating_ip' : value => $dvr_enabled;
'ovn/dns_servers' : value => join(any2array($dns_servers), ',');
'ovn/vhostuser_socket_dir' : value => $vhostuser_socket_dir;
'ovn/vhost_sock_dir' : value => $vhostuser_socket_dir;
}
}

4
spec/classes/neutron_plugins_ml2_ovn_spec.rb
View File

@ -41,7 +41,7 @@ describe 'neutron::plugins::ml2::ovn' do
should contain_neutron_plugin_ml2('ovn/vif_type').with_value(params[:vif_type])
should contain_neutron_plugin_ml2('ovn/enable_distributed_floating_ip').with_value(params[:dvr_enabled])
should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(params[:dns_servers].join(','))
should contain_neutron_plugin_ml2('ovn/vhostuser_socket_dir').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('ovn/vhost_sock_dir').with_value('<SERVICE DEFAULT>')
end
end
@ -70,7 +70,7 @@ describe 'neutron::plugins::ml2::ovn' do
end
it 'should contain valid vhostuser socket dir' do
should contain_neutron_plugin_ml2('ovn/vhostuser_socket_dir').with_value('test')
should contain_neutron_plugin_ml2('ovn/vhost_sock_dir').with_value('test')
end
context 'with DVR' do