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 9F9881875C for ; Sat, 24 Oct 2015 07:16:20 +0000 (UTC) Received: (qmail 91889 invoked by uid 500); 24 Oct 2015 07:16:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91781 invoked by uid 500); 24 Oct 2015 07:16:19 -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 91506 invoked by uid 99); 24 Oct 2015 07:16:19 -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; Sat, 24 Oct 2015 07:16:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EEEEE095F; Sat, 24 Oct 2015 07:16:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Sat, 24 Oct 2015 07:16:20 -0000 Message-Id: <6e20a5937c984099ac5fcc49e01d004d@git.apache.org> In-Reply-To: <761ea364ec1b4f76ad8dd74e6389849a@git.apache.org> References: <761ea364ec1b4f76ad8dd74e6389849a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: updated refs/heads/master to b1c7d4b CLOUDSTACK-8935 - Check if the key is available in the dictionary - This will fix the cleanup problems. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ca32dfc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ca32dfc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ca32dfc Branch: refs/heads/master Commit: 5ca32dfc8205a2847a274597c2e8fde36a85f624 Parents: 3725b3e Author: Wilder Rodrigues Authored: Thu Oct 22 14:52:07 2015 +0200 Committer: Wilder Rodrigues Committed: Thu Oct 22 14:52:07 2015 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ca32dfc/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py index 4010007..e1afb92 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py @@ -39,7 +39,7 @@ class CsGuestNetwork: if not self.guest: return self.config.get_dns() # Can a router provide dhcp but not dns? - if 'dns' in self.data: + if 'dns' in self.data and 'router_guest_gateway' in self.data: return [self.data['router_guest_gateway']] + self.data['dns'].split(',') elif "router_guest_gateway" in self.data: return [self.data['router_guest_gateway']]