cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [08/50] git commit: updated refs/heads/feature/systemvm-persistent-config to 921f6e2
Date Mon, 16 Feb 2015 16:39:59 GMT
Reverting the changes on CsAddress done in commit 374946e07748dd3ad659381c7d88e5e4140e4eeb


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

Branch: refs/heads/feature/systemvm-persistent-config
Commit: 510ae9c61fd412ebaf051aa91e5728aa3b278abe
Parents: f4cb3d6
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Mon Jan 26 13:42:28 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/510ae9c6/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 8ba35f9..9362df1 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -26,7 +26,7 @@ import time
 from CsRoute import CsRoute
 from CsRule import CsRule
 
-VRRP_TYPES = ['public']
+VRRP_TYPES = ['guest']
 
 class CsAddress(CsDataBag):
 
@@ -299,7 +299,7 @@ class CsIP:
                 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
                 # the guest networks interfaces should be up and running.
-                if not self.is_public():
+                if not self.config.cmdline().is_redundant() and not self.is_public():
                     CsHelper.execute(cmd2)
 
     def set_mark(self):


Mime
View raw message