projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debian: Add Homepage
[openvswitch]
/
xenserver
/
opt_xensource_libexec_InterfaceReconfigureBridge.py
diff --git
a/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
b/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
index 2a3aa8cead499f37f6ec3aacaad94ac8db49aa7e..28a70b6a8ad19ce7471f41e46afa17f135719657 100644
(file)
--- a/
xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
+++ b/
xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
@@
-267,6
+267,8
@@
def _configure_physical_interface(pif):
pifrec = db().get_pif_record(pif)
pifrec = db().get_pif_record(pif)
+ log("Configuring physical interface %s" % pifrec['device'])
+
f = open_pif_ifcfg(pif)
f.write("TYPE=Ethernet\n")
f = open_pif_ifcfg(pif)
f.write("TYPE=Ethernet\n")
@@
-278,7
+280,7
@@
def _configure_physical_interface(pif):
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
- mtu = mtu_setting(pifrec['other_config'])
+ mtu = mtu_setting(pifrec['
network'], "PIF", pifrec['
other_config'])
if mtu:
f.write("MTU=%s\n" % mtu)
if mtu:
f.write("MTU=%s\n" % mtu)
@@
-336,7
+338,7
@@
def _configure_bond_interface(pif):
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
- mtu = mtu_setting(pifrec['other_config'])
+ mtu = mtu_setting(pifrec['
network'], "VLAN-PIF", pifrec['
other_config'])
if mtu:
f.write("MTU=%s\n" % mtu)
if mtu:
f.write("MTU=%s\n" % mtu)
@@
-386,7
+388,7
@@
def _configure_vlan_interface(pif):
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
- mtu = mtu_setting(pifrec['other_config'])
+ mtu = mtu_setting(pifrec['
network'], "Bond-PIF", pifrec['
other_config'])
if mtu:
f.write("MTU=%s\n" % mtu)
if mtu:
f.write("MTU=%s\n" % mtu)
@@
-421,6
+423,9
@@
def _configure_pif(pif):
class DatapathBridge(Datapath):
def __init__(self, pif):
class DatapathBridge(Datapath):
def __init__(self, pif):
+ if pif_is_tunnel(pif):
+ raise Error("Tunnel PIFs are not supported in Bridge mode")
+
Datapath.__init__(self, pif)
log("Configured for Bridge datapath")
Datapath.__init__(self, pif)
log("Configured for Bridge datapath")