Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94376106A5 for ; Mon, 16 Feb 2015 16:40:12 +0000 (UTC) Received: (qmail 17755 invoked by uid 500); 16 Feb 2015 16:39:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 17639 invoked by uid 500); 16 Feb 2015 16:39:53 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 16730 invoked by uid 99); 16 Feb 2015 16:39:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Feb 2015 16:39:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5836E0B41; Mon, 16 Feb 2015 16:39:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 16 Feb 2015 16:40:15 -0000 Message-Id: <86094d73646e4324b77843d8ac03dc68@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/50] git commit: updated refs/heads/feature/systemvm-persistent-config to 921f6e2 Another correction Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af866306 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af866306 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af866306 Branch: refs/heads/feature/systemvm-persistent-config Commit: af8663060a29c706200c34cd4b6823dd8e8edcf2 Parents: 7a54ea8 Author: Ian Southam Authored: Wed Jan 28 17:36:56 2015 +0100 Committer: wilderrodrigues Committed: Wed Feb 4 18:47:12 2015 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af866306/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py index 94faeb6..2fa4160 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py @@ -107,8 +107,7 @@ class CsRedundant(object): file.greplace("[RROUTER_BIN_PATH]", self.CS_ROUTER_DIR) # If there is no guest network still bring up the public interface # Maybe necessary for things like VPNs and private gateways - if self.address.get_guest_if(): - file.section("virtual_ipaddress {", "}", self._collect_ips()) + file.section("virtual_ipaddress {", "}", self._collect_ips()) # if self.cl.get_state() == 'MASTER': # file.search(" priority ", " priority %s" % 100) file.commit()