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.8 Commit: 052a9af0235134ea0256993345662a21a7d4e809 Parents: 0eb4fae Author: Murali Reddy <[email protected]> Authored: Thu Sep 29 21:47:15 2016 +0530 Committer: Rohit Yadav <[email protected]> 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):
