From 87d4171c536cbbcd06eb843b03d55399d4c6a414 Mon Sep 17 00:00:00 2001 From: Ian Southam Date: Thu, 29 Jan 2015 16:30:58 +0100 Subject: [PATCH] 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. --- .../patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 0b5cca96e03..193c6f6a46b 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):