From 052a9af0235134ea0256993345662a21a7d4e809 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Thu, 29 Sep 2016 21:47:15 +0530 Subject: [PATCH] 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 --- systemvm/patches/debian/config/opt/cloud/bin/merge.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/config/opt/cloud/bin/merge.py index aa676827adb..76c0ffb8c02 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):