Repository: cloudstack Updated Branches: refs/heads/master 6c3c9ea91 -> 90137acda
VR type in shared network is dhcpsrvr. Ips are being removed due to this issue Signed-off-by: wilderrodrigues <[email protected]> This closes #627 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90137acd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90137acd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90137acd Branch: refs/heads/master Commit: 90137acda2c61dc32d96f4c3e5676a359435ac5c Parents: 6c3c9ea Author: Kishan Kavala <[email protected]> Authored: Tue Jul 28 15:15:41 2015 +0530 Committer: wilderrodrigues <[email protected]> Committed: Tue Jul 28 13:43:09 2015 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/merge.py | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90137acd/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 4999757..2401ef1 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py @@ -182,6 +182,9 @@ class updateDataBag: self.processCLItem('2', "public") elif (self.qFile.data['cmd_line']['type'] == "vpcrouter"): self.processCLItem('0', "control") + elif (self.qFile.data['cmd_line']['type'] == "dhcpsrvr"): + self.processCLItem('0', "guest") + self.processCLItem('1', "control") return cs_cmdline.merge(dbag, self.qFile.data) def processCLItem(self, num, nw_type):
