summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2020-05-01 19:55:48 +0200
committerJernej Jakob <jernej.jakob@gmail.com>2020-05-04 22:59:39 +0200
commit3a3b3c3ffaea0a6e77f6dbf5ee6a3de121b5b9a9 (patch)
tree66ac7c8834c202661259eb85a90589d35c76f90c /src
parent1a170e9172eac154322c49d8c196e09f5804bc4a (diff)
downloadvyos-1x-3a3b3c3ffaea0a6e77f6dbf5ee6a3de121b5b9a9.tar.gz
vyos-1x-3a3b3c3ffaea0a6e77f6dbf5ee6a3de121b5b9a9.zip
vxlan: T2241: fix falling out of bridge when changing settings
Previously, the interface was always deleted and recreated, which removed it from the bridge. - always re-add the interface back to any bridge it is part of
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces-vxlan.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index 5bf1f2fb6..8abd2b46e 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -274,6 +274,10 @@ def apply(vxlan):
if not vxlan['disable']:
v.set_admin_state('up')
+ # re-add ourselves to any bridge we might have fallen out of
+ if vxlan['is_bridge_member']:
+ v.add_to_bridge(vxlan['is_bridge_member'])
+
return None