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

CS-14946, check if it is linux bridge before call ovs

This commit is contained in:
anthony 2012-05-23 19:06:35 -07:00
parent b650fef1e0
commit 175f396c1e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/vm/hypervisor/xenserver/vmops
View File

@ -275,16 +275,24 @@ def setLinkLocalIP(session, args):
txt = util.pread2(cmd)
except:
try:
cmd = ["brctl", "addbr", brName]
txt = util.pread2(cmd)
cmd = ['cat', '/etc/xensource/network.conf']
result = util.pread2(cmd)
except:
pass
try:
cmd = ["ovs-vsctl", "add-br", brName]
txt = util.pread2(cmd)
except:
pass
return 'can not cat network.conf'
if result.lower() == "bridge":
try:
cmd = ["brctl", "addbr", brName]
txt = util.pread2(cmd)
except:
pass
else:
try:
cmd = ["ovs-vsctl", "add-br", brName]
txt = util.pread2(cmd)
except:
pass
try:
cmd = ["ifconfig", brName, "169.254.0.1", "netmask", "255.255.0.0"]