]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
Revert "addons: bridge: warn/err if bridge-access is missing under vxlan bridge VA...
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Thu, 12 Jan 2017 03:58:02 +0000 (19:58 -0800)
committerRoopa Prabhu <roopa@cumulusnetworks.com>
Thu, 12 Jan 2017 03:58:02 +0000 (19:58 -0800)
This reverts commit 4e2db079564a5055a03d2e7e97807b7956c6e110.

reverting because of some reported false errors.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
addons/bridge.py

index 8908661e070c02417ff8a9fd6e0b86fe29fdc145..97ceb4be200069393179bc300b89ae4a71575d12 100644 (file)
@@ -962,7 +962,8 @@ class bridge(moduleBase):
 
         """
         if not isbridge and bportifaceobj.link_kind & ifaceLinkKind.VXLAN:
-            if (not vids or not pvid) or vids != pvid:
+            if ((not vids or not pvid)
+                    and not bportifaceobj.get_attr_value('bridge-access')):
                 self._error_vxlan_in_vlan_aware_br(bportifaceobj,
                                                    bportifaceobj.upperifaces[0])
                 return