qinq|vlan: ovs: add ovsint interfaces to ovs-ports list

if not, on reload, interfaces are unplug/replugged with packet
loss.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm
index dcec6b4fc92de84289a000c624543d00d4e80d91..20c0986d2de352c84ac72cabd8b8e0636e2990e1 100644 (file)
--- a/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -74,6 +74,10 @@ sub generate_sdn_config {
        push @iface_config, "ovs_options vlan_mode=dot1q-tunnel tag=$stag other_config:qinq-ethtype=$vlanprotocol";
        push(@{$config->{$svlan_iface}}, @iface_config) if !$config->{$svlan_iface};
 
+       #redefine main ovs bridge, ifupdown2 will merge ovs_ports
+       @iface_config = ();
+       push @iface_config, "ovs_ports $svlan_iface";
+       push(@{$config->{$bridge}}, @iface_config); 
 
        #zone vlan aware bridge
        @iface_config = ();

diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm
index 987c553509758039e72aad6ed02c31190092ce29..aeff1a460b365117856f04cee3d0a30aa7f25ed3 100644 (file)
--- a/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -66,9 +66,13 @@ sub generate_sdn_config {
        } else {
            push @iface_config, "ovs_options tag=$tag";
        }
-
        push(@{$config->{$vnet_uplink}}, @iface_config) if !$config->{$vnet_uplink};
 
+       #redefine main ovs bridge, ifupdown2 will merge ovs_ports
+       @iface_config = ();
+       push @iface_config, "ovs_ports $vnet_uplink";
+       push(@{$config->{$bridge}}, @iface_config);
+
        @iface_config = ();
        push @iface_config, "ovs_type OVSBridge";
        push @iface_config, "ovs_ports $vnet_uplink";