cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [02/13] git commit: updated refs/heads/master to 6fe5ae0
Date Tue, 20 Oct 2015 06:01:07 GMT
CLOUDSTACK-8952 - Remove the '--vrrp' search criteria form the CsProcess constructor call

   - There is no such process, which makes the CsProcess.find return false and restart keepalived
all the time.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08b983fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08b983fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08b983fe

Branch: refs/heads/master
Commit: 08b983fe022d309c5f49f776cce7c2b4a3f01cfd
Parents: 9363be3
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Wed Oct 14 11:21:53 2015 +0200
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Sat Oct 17 12:20:39 2015 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08b983fe/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
index abe997c..cdc66d8 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@ -173,7 +173,7 @@ class CsRedundant(object):
         conntrackd_cron.add("@reboot root service conntrackd start", -1)
         conntrackd_cron.commit()
 
-        proc = CsProcess(['/usr/sbin/keepalived', '--vrrp'])
+        proc = CsProcess(['/usr/sbin/keepalived'])
         if not proc.find() or keepalived_conf.is_changed():
             CsHelper.service("keepalived", "restart")
 


Mime
View raw message