You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/10/21 04:47:32 UTC
[15/18] git commit: updated refs/heads/4.9 to 9b9b49e
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93ac134f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93ac134f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93ac134f
Branch: refs/heads/4.9
Commit: 93ac134f1e5c4c4c22029eca241f75362303837a
Parents: 0c146e1
Author: Murali Reddy <mu...@gmail.com>
Authored: Wed Oct 5 14:52:06 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Oct 6 16:41:29 2016 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/merge.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ac134f/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 76c0ffb..aab29e8 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/merge.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/merge.py
@@ -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()