Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4D7522009EE for ; Wed, 18 May 2016 21:54:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C2C7160A15; Wed, 18 May 2016 19:54:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9424F1609B0 for ; Wed, 18 May 2016 21:54:29 +0200 (CEST) Received: (qmail 95085 invoked by uid 500); 18 May 2016 19:54:21 -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 94702 invoked by uid 99); 18 May 2016 19:53:08 -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; Wed, 18 May 2016 19:53:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DABBBE0050; Wed, 18 May 2016 19:53:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Wed, 18 May 2016 19:53:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: updated refs/heads/4.7 to ebc70a5 archived-at: Wed, 18 May 2016 19:54:30 -0000 Configure rVPC for router.redundant.vrrp.interval advert_int setting Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c0eee43 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c0eee43 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c0eee43 Branch: refs/heads/4.7 Commit: 9c0eee4387ae2dc0366d0c13f3a3e242d929a3c9 Parents: 2bfb12c Author: Remi Bergsma Authored: Wed Mar 23 16:56:54 2016 +0100 Committer: Remi Bergsma Committed: Fri May 13 14:37:04 2016 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py | 4 ++++ systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py | 1 + systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 3 +++ 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0eee43/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py index ce490aa..9ccb768 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py @@ -154,3 +154,7 @@ class CsCmdLine(CsDataBag): return self.idata()['useextdns'] return False + def get_advert_int(self): + if 'advert_int' in self.idata(): + return self.idata()['advert_int'] + return 1 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0eee43/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py index 7829c0a..78ad859 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py @@ -113,6 +113,7 @@ class CsFile: self.new_config[sind:eind] = content def greplace(self, search, replace): + logging.debug("Searching for %s and replacing with %s" % (search, replace)) self.new_config = [w.replace(search, replace) for w in self.new_config] def search(self, search, replace): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c0eee43/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 f1ab5f7..f8d2bc2 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py @@ -138,6 +138,9 @@ class CsRedundant(object): " router_id ", " router_id %s" % self.cl.get_name()) keepalived_conf.search( " interface ", " interface %s" % guest.get_device()) + keepalived_conf.search( + " advert_int ", " advert_int %s" % self.cl.get_advert_int()) + keepalived_conf.greplace("[RROUTER_BIN_PATH]", self.CS_ROUTER_DIR) keepalived_conf.section("authentication {", "}", [ " auth_type AH \n", " auth_pass %s\n" % self.cl.get_router_password()])