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/7f6fb1f4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f6fb1f4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f6fb1f4 Branch: refs/heads/feature/systemvm-persistent-config Commit: 7f6fb1f474c33101b3011f6080bf75d745b07551 Parents: 68b5e82 Author: wilderrodrigues <[email protected]> Authored: Mon Jan 26 13:42:28 2015 +0100 Committer: wilderrodrigues <[email protected]> Committed: Mon Feb 16 16:08:37 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/7f6fb1f4/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):
