summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2018-10-25 11:34:24 -0700
committerhagbard <vyosdev@derith.de>2018-10-25 11:34:24 -0700
commit4029814a1ee22d02748ab92e01c357c66a9f9137 (patch)
tree94113a65cd1574c660393178a771d1717ff58f34
parent9cf0514668b1461d3b74076b99c9edabafa10418 (diff)
downloadvyos-1x-4029814a1ee22d02748ab92e01c357c66a9f9137.tar.gz
vyos-1x-4029814a1ee22d02748ab92e01c357c66a9f9137.zip
T933: vrrp split brain while using unicast mode and virtual mac address
- adding vmac_xmit_base to keepalived.conf when use_vmac is being used otherwise both nodes will become master
-rw-r--r--debian/changelog7
-rwxr-xr-xsrc/conf_mode/vrrp.py1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a7c428cda..1d0d37d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyos-1x (1.2.0-3) unstable; urgency=medium
+
+ * T933: adding vmac_xmit_base if use_vmac has been chosen
+ to avoid split-brain
+
+ -- hagbard <vyosdev@derith.de> Thu, 25 Oct 2018 11:14:44 -0700
+
vyos-1x (1.2.0-2) unstable; urgency=medium
* T773: adding wireguard support
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index 0480a886a..c458e3b04 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -78,6 +78,7 @@ vrrp_instance {{ group.name }} {
{% if group.use_vmac -%}
use_vmac {{group.interface}}v{{group.vrid}}
+ vmac_xmit_base
{% endif -%}
{% if group.auth_password -%}