From d0842b04e7379c1771843aaf6e044464cefa72b8 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Thu, 4 Apr 2019 18:17:53 +0530 Subject: [PATCH] Correct the ovn option name for vhost socket directory Actual ovn configuration is 'vhost_sock_dir' in networking-ovn to set the vhostuser socket directory. Change the conf name from vhostuser_socket_dir to the correct one. Change-Id: I79130a21a31a589460724a4a68cfadb38ce4d26b --- manifests/plugins/ml2/ovn.pp | 2 +- spec/classes/neutron_plugins_ml2_ovn_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index 8d39e0570..4ab24d7f7 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/manifests/plugins/ml2/ovn.pp @@ -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; } } diff --git a/spec/classes/neutron_plugins_ml2_ovn_spec.rb b/spec/classes/neutron_plugins_ml2_ovn_spec.rb index 26bc976b9..44d18345c 100644 --- a/spec/classes/neutron_plugins_ml2_ovn_spec.rb +++ b/spec/classes/neutron_plugins_ml2_ovn_spec.rb @@ -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('') + should contain_neutron_plugin_ml2('ovn/vhost_sock_dir').with_value('') 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