cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [29/50] [abbrv] git commit: updated refs/heads/feature/systemvm-persistent-config to 4fe7264
Date Wed, 04 Feb 2015 20:28:49 GMT
Removing guest interfaces form the VRRP list
Removing the not is_redundant from the check that put interfaces UP.
  - it now checks only "not is_public"


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

Branch: refs/heads/feature/systemvm-persistent-config
Commit: f4cb3d61b379208f26a32822dd00608fc94c0c91
Parents: 5881a86
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Sat Jan 24 11:55:06 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Wed Feb 4 18:47:08 2015 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py   | 6 +++---
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4cb3d61/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index e8d751d..8ba35f9 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -26,8 +26,7 @@ import time
 from CsRoute import CsRoute
 from CsRule import CsRule
 
-VRRP_TYPES = ['guest']
-
+VRRP_TYPES = ['public']
 
 class CsAddress(CsDataBag):
 
@@ -299,7 +298,8 @@ class CsIP:
             if " DOWN " in i:
                 cmd2 = "ip link set %s up" % self.getDevice()
                 # Do not change the state of ips on a redundant router that are managed by
vrrp or CsRedundant
-                if not self.config.cmdline().is_redundant() and not self.is_public():
+                # the guest networks interfaces should be up and running.
+                if not self.is_public():
                     CsHelper.execute(cmd2)
 
     def set_mark(self):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4cb3d61/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 1a3e12a..aca10b2 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@ -147,6 +147,7 @@ class CsRedundant(object):
         CsHelper.service("dnsmasq", "stop")
         cl.dbag['config']['redundant_master'] = "false"
         cl.save()
+        logging.info("Router switched to fault mode")
 
     def set_backup(self):
         """ Set the current router to backup """
@@ -171,6 +172,7 @@ class CsRedundant(object):
         self.cl.dbag['config']['redundant_master'] = "false"
         CsHelper.service("keepalived", "restart")
         self.cl.save()
+        logging.info("Router switched to backup mode")
 
     def set_master(self):
         """ Set the current router to master """


Mime
View raw message