summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2023-09-23 14:04:48 +0200
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2023-09-24 16:50:05 +0200
commit5acf5acedbf7e0c581653ddf2e7693f148017943 (patch)
tree53f0a0a0dd62f12c0aa7f227315633a62a3a52f7 /src/conf_mode
parentfd0bcaf120bc4ad5f3e9add93f0fa2c2c60e984f (diff)
downloadvyos-1x-5acf5acedbf7e0c581653ddf2e7693f148017943.tar.gz
vyos-1x-5acf5acedbf7e0c581653ddf2e7693f148017943.zip
conntrack: T5376: Use vyos.configdep to call conntrack-sync
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/conntrack.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/conf_mode/conntrack.py b/src/conf_mode/conntrack.py
index 75fd26588..2c5fa335e 100755
--- a/src/conf_mode/conntrack.py
+++ b/src/conf_mode/conntrack.py
@@ -20,6 +20,7 @@ import re
from sys import exit
from vyos.config import Config
+from vyos.configdep import set_dependents, call_dependents
from vyos.utils.process import process_named_running
from vyos.utils.dict import dict_search
from vyos.utils.dict import dict_search_args
@@ -78,11 +79,6 @@ valid_groups = [
'port_group'
]
-def resync_conntrackd():
- tmp = run('/usr/libexec/vyos/conf_mode/conntrack_sync.py')
- if tmp > 0:
- print('ERROR: error restarting conntrackd!')
-
def get_config(config=None):
if config:
conf = config
@@ -105,6 +101,9 @@ def get_config(config=None):
conntrack['module_map'] = module_map
+ if conf.exists(['service', 'conntrack-sync']):
+ set_dependents('conntrack_sync', conf)
+
return conntrack
def verify(conntrack):
@@ -213,9 +212,7 @@ def apply(conntrack):
module_str = ' '.join(rm_modules)
cmd(f'rmmod {module_str}')
- if process_named_running('conntrackd'):
- # Reload conntrack-sync daemon to fetch new sysctl values
- resync_conntrackd()
+ call_dependents()
# We silently ignore all errors
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1264080