From 1efeab024888b542659f9e5c0361c0e9ae490245 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 12 May 2022 08:52:31 +0000 Subject: Revert "NHRP : T4399: fix issues restart nhrp when add or del tunnel" This reverts commit d1455f936ca721633fcc04d5c84169b4ccf2f447. New spokes can't register on hub with 'reload-or-restart' option And requires option 'restart' for opennhrp.service --- src/conf_mode/protocols_nhrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf_mode/protocols_nhrp.py b/src/conf_mode/protocols_nhrp.py index 92b335085..b6371d09f 100755 --- a/src/conf_mode/protocols_nhrp.py +++ b/src/conf_mode/protocols_nhrp.py @@ -104,7 +104,7 @@ def apply(nhrp): if rule_handle: remove_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', rule_handle) - action = 'reload-or-restart' if nhrp and 'tunnel' in nhrp else 'stop' + action = 'restart' if nhrp and 'tunnel' in nhrp else 'stop' run(f'systemctl {action} opennhrp') return None -- cgit v1.2.3