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 24353200BB6 for ; Fri, 21 Oct 2016 06:47:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 22CF1160AF5; Fri, 21 Oct 2016 04:47:27 +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 67BB3160AF2 for ; Fri, 21 Oct 2016 06:47:26 +0200 (CEST) Received: (qmail 10455 invoked by uid 500); 21 Oct 2016 04:47: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 10033 invoked by uid 99); 21 Oct 2016 04:47: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; Fri, 21 Oct 2016 04:47:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31D0CE38EE; Fri, 21 Oct 2016 04:47:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Fri, 21 Oct 2016 04:47:32 -0000 Message-Id: <9c71aa2432ec46a492325c7a50ba170f@git.apache.org> In-Reply-To: <74073283ff344e4488145c521aae4430@git.apache.org> References: <74073283ff344e4488145c521aae4430@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/18] git commit: updated refs/heads/4.9 to 9b9b49e archived-at: Fri, 21 Oct 2016 04:47:27 -0000 CLOUDSTACK-9533: gateway of public IP is not handled correctly when parsing the cmd_line.json to create ips.json databag using 'gateway' in cmd_line for the public ip gateway while creating ips.json databag Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93ac134f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93ac134f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93ac134f Branch: refs/heads/4.9 Commit: 93ac134f1e5c4c4c22029eca241f75362303837a Parents: 0c146e1 Author: Murali Reddy Authored: Wed Oct 5 14:52:06 2016 +0530 Committer: Rohit Yadav Committed: Thu Oct 6 16:41:29 2016 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/merge.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ac134f/systemvm/patches/debian/config/opt/cloud/bin/merge.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py index 76c0ffb..aab29e8 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py @@ -222,10 +222,13 @@ class updateDataBag: dp['source_nat'] = False dp['add'] = True dp['one_to_one_nat'] = False - if('localgw' in self.qFile.data['cmd_line']): - dp['gateway'] = self.qFile.data['cmd_line']['localgw'] + if nw_type == "public": + dp['gateway'] = self.qFile.data['cmd_line']['gateway'] else: - dp['gateway'] = 'None' + if('localgw' in self.qFile.data['cmd_line']): + dp['gateway'] = self.qFile.data['cmd_line']['localgw'] + else: + dp['gateway'] = 'None' dp['nic_dev_id'] = num dp['nw_type'] = nw_type qf = QueueFile()