summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-04-05 18:30:35 +0200
committerGitHub <noreply@github.com>2024-04-05 18:30:35 +0200
commit5c66e512df82ca97ed73534e89e29ac4c7c32b4a (patch)
tree1fdc3e9955f4af16557b82c6c48f4114a36a5d0b
parentd5750f0b6c338211b8c4a3ddd88365fe69ab008b (diff)
parent8052a2e07b67156b95a20701184596c1b8af8369 (diff)
downloadvyos-1x-5c66e512df82ca97ed73534e89e29ac4c7c32b4a.tar.gz
vyos-1x-5c66e512df82ca97ed73534e89e29ac4c7c32b4a.zip
Merge pull request #3256 from natali-rs1985/T1244-equuleus
conntrack-sync: T1244: Support for StartupResync in conntrackd
-rw-r--r--data/templates/conntrackd/conntrackd.conf.tmpl1
-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.tmpl b/data/templates/conntrackd/conntrackd.conf.tmpl
index 3f957b696..b87edfd75 100644
--- a/data/templates/conntrackd/conntrackd.conf.tmpl
+++ b/data/templates/conntrackd/conntrackd.conf.tmpl
@@ -4,6 +4,7 @@
Sync {
Mode FTFW {
DisableExternalCache {{ 'on' if disable_external_cache is defined else 'off' }}
+ StartupResync {{ 'on' if enable_startup_resync is defined else 'off' }}
}
{% for iface, iface_config in interface.items() %}
{% if loop.first %}
diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 105c2a3a0..4bb07643b 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -80,6 +80,12 @@
<multi/>
</properties>
</leafNode>
+ <leafNode name="enable-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>