- honour per-instance NIC link setting for openvswitch networks

[packages/ganeti.git] / use-vm-openvswitch-link.patch

diff --git a/use-vm-openvswitch-link.patch b/use-vm-openvswitch-link.patch
new file mode 100644 (file)
index 0000000..84c34ce
--- /dev/null
+++ b/use-vm-openvswitch-link.patch
@@ -0,0 +1,20 @@
+--- ganeti-2.9.3/lib/hypervisor/hv_xen.py~     2014-01-27 10:20:35.000000000 +0100
++++ ganeti-2.9.3/lib/hypervisor/hv_xen.py      2014-02-06 23:51:59.830493839 +0100
+@@ -1077,7 +1077,7 @@
+       ip = getattr(nic, "ip", None)
+       if ip is not None:
+         nic_str += ", ip=%s" % ip
+-      if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
++      if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED or nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_OVS:
+         nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
+       if hvp[constants.HV_VIF_SCRIPT]:
+         nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT]
+@@ -1248,7 +1248,7 @@
+       ip = getattr(nic, "ip", None)
+       if ip is not None:
+         nic_str += ", ip=%s" % ip
+-      if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
++      if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED or nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_OVS:
+         nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
+       if hvp[constants.HV_VIF_SCRIPT]:
+         nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT]