diff --git a/systemvm/patches/debian/buildsystemvm.sh b/systemvm/patches/debian/buildsystemvm.sh index b724b295f57..73a3771ca09 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 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 9a983762c35..c106983644f 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")