[lxc-devel] [lxd/master] Network: Make setting bridge VLAN filtering & default PVID optional

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 431 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200610/039f8065/attachment.bin>
-------------- next part --------------
From 6f459040405e9936fad49f33669284f98c034c43 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Wed, 10 Jun 2020 09:57:51 +0100
Subject: [PATCH] lxd/network: Make setting bridge VLAN filtering & default
 PVID optional

Warn if setting failed.

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 lxd/network/network.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lxd/network/network.go b/lxd/network/network.go
index d8819d0a3b..2c5d9abad3 100644
--- a/lxd/network/network.go
+++ b/lxd/network/network.go
@@ -287,13 +287,13 @@ func (n *Network) setup(oldConfig map[string]string) error {
 	if n.config["bridge.driver"] != "openvswitch" {
 		err = BridgeVLANFilterSetStatus(n.name, "1")
 		if err != nil {
-			return err
+			logger.Warnf("%v", err)
 		}
 
 		// Set the default PVID for new ports to 1.
 		err = BridgeVLANSetDefaultPVID(n.name, "1")
 		if err != nil {
-			return err
+			logger.Warnf("%v", err)
 		}
 	}