summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2020-05-01 18:17:47 +0200
committerJernej Jakob <jernej.jakob@gmail.com>2020-05-04 22:59:39 +0200
commit9979a6ef4f45ffc6f3686e6c63e50818ea32b610 (patch)
tree37b2f3399d3e0b325d42deb7322fce6d7aaded25 /src/conf_mode
parent5a0101bdd4b117001e0b0f77acae09b96865c815 (diff)
downloadvyos-1x-9979a6ef4f45ffc6f3686e6c63e50818ea32b610.tar.gz
vyos-1x-9979a6ef4f45ffc6f3686e6c63e50818ea32b610.zip
geneve: 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 in case it is deleted and recreated
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-geneve.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py
index ab1bd7d7b..11d6cc2f1 100755
--- a/src/conf_mode/interfaces-geneve.py
+++ b/src/conf_mode/interfaces-geneve.py
@@ -164,6 +164,10 @@ def apply(geneve):
if not geneve['disable']:
g.set_admin_state('up')
+ # re-add ourselves to any bridge we might have fallen out of
+ if geneve['is_bridge_member']:
+ g.add_to_bridge(geneve['is_bridge_member'])
+
return None