This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new 05d1d56 vr: restart conntrackd instead of '/usr/sbin/conntrackd -d'
(#5275)
05d1d56 is described below
commit 05d1d568fbd5a4c0ffed2928251b6843c47dfdb3
Author: Wei Zhou <[email protected]>
AuthorDate: Mon Aug 9 10:05:45 2021 +0200
vr: restart conntrackd instead of '/usr/sbin/conntrackd -d' (#5275)
* vr: restart conntrackd instead of '/usr/sbin/conntrackd -d'
* vr: remove unused cmd
* Revert "vr: remove unused cmd"
This reverts commit b97cf469952fe0706d91af411eaffa62a06761a6.
* vr: remove unused cmd
---
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
index 190de1a..2372770 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
@@ -279,8 +279,7 @@ class CsRedundant(object):
CsHelper.execute(cmd2)
dev = interface.get_device()
- cmd = "%s -C %s" % (self.CONNTRACKD_BIN, self.CONNTRACKD_CONF)
- CsHelper.execute("%s -d" % cmd)
+ CsHelper.service("conntrackd", "restart")
CsHelper.service("ipsec", "stop")
CsHelper.service("xl2tpd", "stop")
