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 71289200BC7 for ; Fri, 21 Oct 2016 06:47:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6FFA9160AE0; Fri, 21 Oct 2016 04:47:20 +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 BED9B160AF2 for ; Fri, 21 Oct 2016 06:47:19 +0200 (CEST) Received: (qmail 9071 invoked by uid 500); 21 Oct 2016 04:47:18 -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 9022 invoked by uid 99); 21 Oct 2016 04:47:18 -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:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 92536E0902; Fri, 21 Oct 2016 04:47:18 +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:19 -0000 Message-Id: <8db7027ec9c24a68aaacd29ffc46f2cc@git.apache.org> In-Reply-To: <74073283ff344e4488145c521aae4430@git.apache.org> References: <74073283ff344e4488145c521aae4430@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/18] git commit: updated refs/heads/4.9 to 9b9b49e archived-at: Fri, 21 Oct 2016 04:47:20 -0000 CLOUDSTACK-9515: internal LB vm is not handled when parsing cmd_line.json, resulting in internal LB vm not come up parsing cmd_line to create 'ips' data bag, never handled internal lb vm, but still worked due to another bug. support for internal lb vm is added with this fix Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/052a9af0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/052a9af0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/052a9af0 Branch: refs/heads/4.9 Commit: 052a9af0235134ea0256993345662a21a7d4e809 Parents: 0eb4fae Author: Murali Reddy Authored: Thu Sep 29 21:47:15 2016 +0530 Committer: Rohit Yadav Committed: Wed Oct 5 15:11:00 2016 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/merge.py | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/052a9af0/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 aa67682..76c0ffb 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py @@ -207,6 +207,10 @@ class updateDataBag: elif (self.qFile.data['cmd_line']['type'] == "dhcpsrvr"): self.processCLItem('0', "guest") self.processCLItem('1', "control") + elif (self.qFile.data['cmd_line']['type'] == "ilbvm"): + self.processCLItem('0', "guest") + self.processCLItem('1', "control") + return cs_cmdline.merge(dbag, self.qFile.data) def processCLItem(self, num, nw_type):