diff options
| -rw-r--r-- | .github/workflows/unused-imports.yml | 4 | ||||
| -rw-r--r-- | data/templates/conntrackd/conntrackd.conf.j2 | 1 | ||||
| -rw-r--r-- | interface-definitions/service_conntrack-sync.xml.in | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/.github/workflows/unused-imports.yml b/.github/workflows/unused-imports.yml index d6e820ae6..da57bd270 100644 --- a/.github/workflows/unused-imports.yml +++ b/.github/workflows/unused-imports.yml @@ -1,7 +1,9 @@ name: Check for unused imports using Pylint on: pull_request_target: - types: [opened, reopened, ready_for_review, locked] + branches: + - current + - sagitta jobs: Check-Unused-Imports: 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> |