You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/02/16 17:40:16 UTC
[25/50] git commit: updated
refs/heads/feature/systemvm-persistent-config to 921f6e2
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/70113806
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70113806
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70113806
Branch: refs/heads/feature/systemvm-persistent-config
Commit: 701138064fd91ffea6a116ec2f7242208130ab65
Parents: 460378a
Author: Ian Southam <is...@schubergphilis.com>
Authored: Thu Jan 29 16:30:58 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Feb 4 18:47:13 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/70113806/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):