etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Murali Reddy 2016-10-05 14:52:06 +05:30 committed by Rohit Yadav
parent 0c146e14c6
commit 93ac134f1e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
systemvm/patches/debian/config/opt/cloud/bin/merge.py
View File

@ -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()