From d7f0cbdc102a1186cec80d0ebf29b8f4ef415435 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 15 May 2021 11:55:03 +0200
Subject: conntrack: T3535: add keepalived notifications for node transitions
---
data/templates/conntrackd/conntrackd.conf.tmpl | 2 +-
data/templates/vrrp/keepalived.conf.tmpl | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'data')
diff --git a/data/templates/conntrackd/conntrackd.conf.tmpl b/data/templates/conntrackd/conntrackd.conf.tmpl
index fdaac7275..1a7b83cc7 100644
--- a/data/templates/conntrackd/conntrackd.conf.tmpl
+++ b/data/templates/conntrackd/conntrackd.conf.tmpl
@@ -74,7 +74,7 @@ General {
Syslog on
LockFile /var/lock/conntrack.lock
UNIX {
- Path /run/conntrackd/conntrackd.ctl
+ Path /var/run/conntrackd.ctl
}
NetlinkBufferSize {{ 2 *1024 *1024 }}
NetlinkBufferSizeMaxGrowth {{ event_listen_queue_size | int *1024 *1024 }}
diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl
index d51522e45..c01101d85 100644
--- a/data/templates/vrrp/keepalived.conf.tmpl
+++ b/data/templates/vrrp/keepalived.conf.tmpl
@@ -96,9 +96,10 @@ vrrp_sync_group {{ sync_group.name }} {
}
{% if sync_group.conntrack_sync %}
- notify_master "/opt/vyatta/sbin/vyatta-vrrp-conntracksync.sh master {{ sync_group.name }}"
- notify_backup "/opt/vyatta/sbin/vyatta-vrrp-conntracksync.sh backup {{ sync_group.name }}"
- notify_fault "/opt/vyatta/sbin/vyatta-vrrp-conntracksync.sh fault {{ sync_group.name }}"
+ {% set vyos_helper = "/usr/libexec/vyos/vyos-vrrp-conntracksync.sh" %}
+ notify_master "{{ vyos_helper }} master {{ sync_group.name }}"
+ notify_backup "{{ vyos_helper }} backup {{ sync_group.name }}"
+ notify_fault "{{ vyos_helper }} fault {{ sync_group.name }}"
{% endif %}
}
--
cgit v1.2.3