From f85794de8572e9f89137da8a3cba9b33438afd34 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 9 Apr 2018 12:26:44 -0400 Subject: [PATCH] Corrects ODL-OVS vhostusermode default and docs The vhostuser_mode parameter was incorrectly defined as the client/server mode of OVS, when actually it is the configuration of the VIF port/QEMU mode. Therefore a value of 'client' will actually configure OVS to be in 'server' mode. This type of port is deprecated and the correct value should be 'server' (where QEMU creates the port). Partial-Bug: 1762473 Change-Id: Idda82cae48b11eae1c79c6bbdd85827e3e43e56b Signed-off-by: Tim Rozet --- manifests/plugins/ovs/opendaylight.pp | 10 +++++----- .../fix-odl-ovs-vhostuser_mode-6a99fc68b305a583.yaml | 6 ++++++ spec/classes/neutron_plugins_ovs_opendaylight_spec.rb | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/fix-odl-ovs-vhostuser_mode-6a99fc68b305a583.yaml diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp index 50c18ad51..7829f9dca 100644 --- a/manifests/plugins/ovs/opendaylight.pp +++ b/manifests/plugins/ovs/opendaylight.pp @@ -59,11 +59,11 @@ # Defaults to "/var/run/openvswitch" # # [*vhostuser_mode*] -# (optional) Specify the mode for OVS when creating vhostuser ports. -# Valid values are 'client' or 'server'. In client mode, the hypervisor +# (optional) Specify the mode for the VIF when creating vhostuser ports. +# Valid values are 'client' or 'server'. In client mode, openvswitch # will be responsible for creating the vhostuser socket. In server mode, -# OVS will create the vhostuser socket. -# Defaults to "client" +# the hypervisor will create the vhostuser socket. +# Defaults to "server" # # [*enable_hw_offload*] # (optional) Configure OVS to use @@ -101,7 +101,7 @@ class neutron::plugins::ovs::opendaylight ( $allowed_network_types = ['local', 'vlan', 'vxlan', 'gre'], $enable_dpdk = false, $vhostuser_socket_dir = '/var/run/openvswitch', - $vhostuser_mode = 'client', + $vhostuser_mode = 'server', $enable_hw_offload = false, $enable_tls = false, $tls_key_file = undef, diff --git a/releasenotes/notes/fix-odl-ovs-vhostuser_mode-6a99fc68b305a583.yaml b/releasenotes/notes/fix-odl-ovs-vhostuser_mode-6a99fc68b305a583.yaml new file mode 100644 index 000000000..ae55f6efb --- /dev/null +++ b/releasenotes/notes/fix-odl-ovs-vhostuser_mode-6a99fc68b305a583.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes default of vhostuser_mode in ODL-OVS to be server, and clarifies + the configuration parameter. See + https://bugs.launchpad.net/tripleo/+bug/1762473 diff --git a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb index b6dcf4811..bcbad1385 100644 --- a/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb @@ -14,7 +14,7 @@ describe 'neutron::plugins::ovs::opendaylight' do :allowed_network_types => ['local', 'vlan', 'vxlan', 'gre'], :enable_dpdk => false, :vhostuser_socket_dir => '/var/run/openvswitch', - :vhostuser_mode => 'client', + :vhostuser_mode => 'server', :enable_hw_offload => false, :enable_tls => false, }