cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/6] git commit: updated refs/heads/master to b29d8e7
Date Thu, 16 Jul 2015 11:16:02 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f5ed824ea -> b29d8e728


CLOUDSTACK-8616 - Add a cron job to restart ConntrackD on reboot

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>


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

Branch: refs/heads/master
Commit: 4b3db3d117f6b6f1091e3c079c179dd5f6034eff
Parents: f78a65c
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Mon Jul 13 19:29:41 2015 +0200
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Thu Jul 16 13:14:48 2015 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/buildsystemvm.sh                    | 2 +-
 .../patches/debian/config/opt/cloud/bin/cs/CsRedundant.py   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b3db3d1/systemvm/patches/debian/buildsystemvm.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/buildsystemvm.sh b/systemvm/patches/debian/buildsystemvm.sh
index b724b29..73a3771 100755
--- a/systemvm/patches/debian/buildsystemvm.sh
+++ b/systemvm/patches/debian/buildsystemvm.sh
@@ -376,7 +376,7 @@ packages() {
   #xenstore utils
   chroot . apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0
   #keepalived - install version 1.2.13 from wheezy backports
-  chroot . apt-get --no-install-recommends -t wheezy-backports -q -y --force-yes install
keepalived
+  chroot . apt-get --no-install-recommends -q -y --force-yes -t wheezy-backports install
keepalived
   #conntrackd
   chroot . apt-get --no-install-recommends -q -y --force-yes install conntrackd ipvsadm libnetfilter-conntrack3
libnl1
   #ipcalc

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b3db3d1/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 9a98376..c106983 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@ -139,7 +139,7 @@ class CsRedundant(object):
         heartbeat_cron.add("* * * * * root $SHELL %s/check_heartbeat.sh 2>&1 >
/dev/null" % self.CS_ROUTER_DIR, -1)
         heartbeat_cron.add("* * * * * root sleep 30; $SHELL %s/check_heartbeat.sh 2>&1
> /dev/null" % self.CS_ROUTER_DIR, -1)
         heartbeat_cron.commit()
-        
+
         # Configure KeepaliveD cron job - runs at every reboot
         keepalived_cron = CsFile("/etc/cron.d/keepalived")
         keepalived_cron.add("SHELL=/bin/bash", 0)
@@ -147,6 +147,13 @@ class CsRedundant(object):
         keepalived_cron.add("@reboot root service keepalived start", -1)
         keepalived_cron.commit()
 
+        # Configure ConntrackD cron job - runs at every reboot
+        conntrackd_cron = CsFile("/etc/cron.d/conntrackd")
+        conntrackd_cron.add("SHELL=/bin/bash", 0)
+        conntrackd_cron.add("PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin",
1)
+        conntrackd_cron.add("@reboot root service conntrackd start", -1)
+        conntrackd_cron.commit()
+
         proc = CsProcess(['/usr/sbin/keepalived', '--vrrp'])
         if not proc.find() or keepalived_conf.is_changed():
             CsHelper.service("keepalived", "restart")


Mime
View raw message