diff options
author | Mark Gray <mark.d.gray@redhat.com> | 2021-01-05 17:53:41 -0500 |
---|---|---|
committer | Ilya Maximets <i.maximets@ovn.org> | 2021-01-06 12:04:45 +0100 |
commit | fe5ff26a49f61982a785fe8bf5739e739bf1bc00 (patch) | |
tree | be261b5d2f0918984d648a8c3f1f035b6d0a4c64 /ipsec | |
parent | aa8bed0986f3a5b48ba85d519ef75128ef1d32ca (diff) | |
download | openvswitch-fe5ff26a49f61982a785fe8bf5739e739bf1bc00.tar.gz |
ovs-monitor-ipsec: Add option to not restart IKE daemon.
Signed-off-by: Mark Gray <mark.d.gray@redhat.com>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'ipsec')
-rwxr-xr-x | ipsec/ovs-monitor-ipsec.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in index 6d12cd8d2..64111768b 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -925,7 +925,7 @@ class IPsecTunnel(object): class IPsecMonitor(object): """This class monitors and configures IPsec tunnels""" - def __init__(self, root_prefix, ike_daemon): + def __init__(self, root_prefix, ike_daemon, restart): self.IPSEC = root_prefix + "/usr/sbin/ipsec" self.tunnels = {} @@ -955,7 +955,9 @@ class IPsecMonitor(object): not os.access(self.IPSEC, os.X_OK): vlog.err("IKE daemon is not installed in the system.") - self.ike_helper.restart_ike_daemon() + if restart: + vlog.info("Restarting IKE daemon") + self.ike_helper.restart_ike_daemon() def is_tunneling_type_supported(self, tunnel_type): """Returns True if we know how to configure IPsec for these @@ -1186,6 +1188,8 @@ def main(): parser.add_argument("--ike-daemon", metavar="IKE-DAEMON", help="The IKE daemon used for IPsec tunnels" " (either libreswan or strongswan).") + parser.add_argument("--no-restart-ike-daemon", action='store_true', + help="Don't restart the IKE daemon on startup.") ovs.vlog.add_args(parser) ovs.daemon.add_args(parser) @@ -1198,7 +1202,8 @@ def main(): root_prefix = args.root_prefix if args.root_prefix else "" xfrm = XFRM(root_prefix) - monitor = IPsecMonitor(root_prefix, args.ike_daemon) + monitor = IPsecMonitor(root_prefix, args.ike_daemon, + not args.no_restart_ike_daemon) remote = args.database schema_helper = ovs.db.idl.SchemaHelper() |