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 D93B8200AE2 for ; Fri, 13 May 2016 00:23:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D805F160A15; Thu, 12 May 2016 22:23:21 +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 351E1160939 for ; Fri, 13 May 2016 00:23:21 +0200 (CEST) Received: (qmail 87337 invoked by uid 500); 12 May 2016 22:23:20 -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 87328 invoked by uid 99); 12 May 2016 22:23:20 -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; Thu, 12 May 2016 22:23:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43746DFE5F; Thu, 12 May 2016 22:23:20 +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: Thu, 12 May 2016 22:23:20 -0000 Message-Id: <74cb386c390f4439bffe343d8f7b18ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/4.7 to bbb2dd0 archived-at: Thu, 12 May 2016 22:23:22 -0000 Repository: cloudstack Updated Branches: refs/heads/4.7 170765e90 -> bbb2dd034 This patch addresses two issues: On redundant VR setups, the primary resolver being handed out to instances is the guest_ip (primary IP for the VR). This might lead to problems upon failover, at least while the DHCP lease doesn't update (because the primary resolver will be checked first until times out, however it'll be gone upon failover). If Global Setting use_ext_dns is true, we don't want the VR to be the primary resolver at all. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c269097a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c269097a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c269097a Branch: refs/heads/4.7 Commit: c269097a278b9bdf5b9ded457172ce3bf7b707ad Parents: a243339 Author: Nuno Tavares Authored: Sat May 7 17:56:47 2016 +0200 Committer: Nuno Tavares Committed: Sun May 8 22:47:55 2016 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py | 7 +++++-- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c269097a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py index a08f1cc..a35a545 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py @@ -68,8 +68,11 @@ class CsConfig(object): def get_dns(self): dns = [] - # Check what happens with use_ext_dns - dns.append(self.address().get_guest_ip()) + if not self.cl.get_use_ext_dns(): + if not self.is_vpc() and self.cl.is_redundant(): + dns.append(self.cl.get_guest_gw()) + else: + dns.append(self.address().get_guest_ip()) names = ["dns1", "dns2"] for name in names: if name in self.cmdline().idata(): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c269097a/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 e29aa36..ce490aa 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py @@ -148,3 +148,9 @@ class CsCmdLine(CsDataBag): if "gateway" in self.idata(): return self.idata()['gateway'] return False + + def get_use_ext_dns(self): + if "useextdns" in self.idata(): + return self.idata()['useextdns'] + return False +