You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:18 UTC
[16/50] git commit: updated refs/heads/master to 3c429ee
Who changed my condition!
De Morgans laws chaps
The negation of a conjunction is the disjunction of the negations.
The negation of a disjunction is the conjunction of the negations.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87d4171c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87d4171c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87d4171c
Branch: refs/heads/master
Commit: 87d4171c536cbbcd06eb843b03d55399d4c6a414
Parents: db48a99
Author: Ian Southam <is...@schubergphilis.com>
Authored: Thu Jan 29 16:30:58 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:39:56 2015 +0100
----------------------------------------------------------------------
.../patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87d4171c/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 0b5cca9..193c6f6 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -298,9 +298,12 @@ class CsIP:
for i in CsHelper.execute(cmd):
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
- # the guest networks interfaces should be up and running.
- if not self.config.cmdline().is_redundant() and not self.is_public():
+ # If redundant do not bring up public interfaces
+ # master.py and keepalived deal with tham
+ if self.config.cmdline().is_redundant() and not self.is_public():
+ CsHelper.execute(cmd2)
+ # if not redundant bring everything up
+ if not self.config.cmdline().is_redundant():
CsHelper.execute(cmd2)
def set_mark(self):