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

VR interfaces need the proper network type in ips

This commit is contained in:
Hugo Trippaers 2014-11-07 16:13:08 +01:00 committed by wilderrodrigues
parent 4632936733
commit 01acd3d8ec
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
View File

@ -86,7 +86,7 @@ class CsAddress(CsDataBag):
def add_netstats(self, address):
# add in the network stats iptables rules
dev = "eth%s" % address['nic_dev_id']
if address["nw_type"] == "public_ip":
if address["nw_type"] == "public":
self.fw.append(["", "front", "-A FORWARD -j NETWORK_STATS"])
self.fw.append(["", "front", "-A INPUT -j NETWORK_STATS"])
self.fw.append(["", "front", "-A OUTPUT -j NETWORK_STATS"])

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

@ -141,12 +141,15 @@ class updateDataBag:
# "eth0ip": "192.168.56.32",
# "eth0mask": "255.255.255.0",
self.newData = []
self.processCLItem('0')
self.processCLItem('1')
self.processCLItem('2')
if (self.qFile.data['cmd_line']['type'] == "router"):
self.processCLItem('0', "guest")
self.processCLItem('1', "control")
self.processCLItem('2', "public")
elif (self.qFile.data['cmd_line']['type'] == "vpcrouter"):
self.processCLItem('0', "control")
return cs_cmdline.merge(dbag, self.qFile.data)
def processCLItem(self, num):
def processCLItem(self, num, nw_type):
key = 'eth' + num + 'ip'
dp = {}
if(key in self.qFile.data['cmd_line']):
@ -160,7 +163,7 @@ class updateDataBag:
else:
dp['gateway'] = 'None'
dp['nic_dev_id'] = num
dp['nw_type'] = 'control'
dp['nw_type'] = nw_type
qf = loadQueueFile()
qf.load({ 'ip_address' : [ dp ], 'type' : 'ips'})