summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNataliia Solomko <81954790+natali-rs1985@users.noreply.github.com>2024-04-06 12:08:59 +0300
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-06 09:09:37 +0000
commit04a9471cafc14340447f21c80bca10a34cfa20b1 (patch)
tree94f8f69ad2a8e5035817011ef57cee83b8bce8a0
parent66428fb513f4a3e3c8bdc2f452fc0ac4a3d2657e (diff)
downloadvyos-1x-04a9471cafc14340447f21c80bca10a34cfa20b1.tar.gz
vyos-1x-04a9471cafc14340447f21c80bca10a34cfa20b1.zip
conntrack-sync: T1244: add CLI support for StartupResync
(cherry picked from commit 2eb7f96ca2038bf37dc1d274821ca6f619489b58)
-rw-r--r--data/templates/conntrackd/conntrackd.conf.j21
-rw-r--r--interface-definitions/service_conntrack-sync.xml.in6
2 files changed, 7 insertions, 0 deletions
diff --git a/data/templates/conntrackd/conntrackd.conf.j2 b/data/templates/conntrackd/conntrackd.conf.j2
index 669b20877..30e619daf 100644
--- a/data/templates/conntrackd/conntrackd.conf.j2
+++ b/data/templates/conntrackd/conntrackd.conf.j2
@@ -4,6 +4,7 @@
Sync {
Mode FTFW {
DisableExternalCache {{ 'on' if disable_external_cache is vyos_defined else 'off' }}
+ StartupResync {{ 'on' if startup_resync is vyos_defined else 'off' }}
}
{% for iface, iface_config in interface.items() %}
{% if iface_config.peer is vyos_defined %}
diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 397864867..631c830b4 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -81,6 +81,12 @@
<multi/>
</properties>
</leafNode>
+ <leafNode name="startup-resync">
+ <properties>
+ <help>Order conntrackd to request a complete conntrack table resync against the other node at startup</help>
+ <valueless/>
+ </properties>
+ </leafNode>
<node name="failover-mechanism">
<properties>
<help>Failover mechanism to use for conntrack-sync</help>