diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-06 13:48:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 13:48:57 +0200 |
| commit | 9350acf013519ddaafb3d44fb77559f06a7b50ee (patch) | |
| tree | 764c948d4905af4f272efb2d883a3645021f7fa6 | |
| parent | f0721260fd6b9cbb037d9d8de11acba4d485cea3 (diff) | |
| parent | 04a9471cafc14340447f21c80bca10a34cfa20b1 (diff) | |
| download | vyos-1x-9350acf013519ddaafb3d44fb77559f06a7b50ee.tar.gz vyos-1x-9350acf013519ddaafb3d44fb77559f06a7b50ee.zip | |
Merge pull request #3262 from vyos/mergify/bp/sagitta/pr-3254
conntrack-sync: T1244: Support for StartupResync in conntrackd (backport #3254)
| -rw-r--r-- | data/templates/conntrackd/conntrackd.conf.j2 | 1 | ||||
| -rw-r--r-- | interface-definitions/service_conntrack-sync.xml.in | 6 |
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> |