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 3909A106A4 for ; Mon, 16 Feb 2015 16:40:12 +0000 (UTC) Received: (qmail 17683 invoked by uid 500); 16 Feb 2015 16:39:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 17582 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 16684 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 BEFBEE0AC5; 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:11 -0000 Message-Id: <50ae95a50afb424a949a4439eaf85861@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] git commit: updated refs/heads/feature/systemvm-persistent-config to 921f6e2 This change breaks stuff This id is used to define the groups and will prevent the two vrrp instances from talking to each other Result = MASTER MASTER Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b06ba1ff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b06ba1ff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b06ba1ff Branch: refs/heads/feature/systemvm-persistent-config Commit: b06ba1ffc53f5698850410998a50a6a1e0f9ea77 Parents: 87c893d Author: Ian Southam Authored: Wed Jan 28 12:17:16 2015 +0100 Committer: wilderrodrigues Committed: Wed Feb 4 18:47:11 2015 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b06ba1ff/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 4312462..a1bef3a 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py @@ -102,7 +102,7 @@ class CsRedundant(object): file.search(" priority ", " priority %s" % self.cl.get_priority()) file.search(" weight ", " weight %s" % 2) file.search(" state ", " state %s" % self.cl.get_state()) - file.search(" virtual_router_id ", " virtual_router_id %s" % self.cl.get_router_id()) + #file.search(" virtual_router_id ", " virtual_router_id %s" % self.cl.get_router_id()) file.greplace("[RROUTER_BIN_PATH]", self.CS_ROUTER_DIR) file.section("virtual_ipaddress {", "}", self._collect_ips()) if self.cl.get_state() == 'MASTER':