From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 6 Feb 2014 22:53:16 +0000 (+0100)
Subject: - honour per-instance NIC link setting for openvswitch networks
X-Git-Tag: auto/th/ganeti-2.9.3-1~8
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fganeti.git;a=commitdiff_plain;h=c8ebdc52245ec94008c31e017090da5bd13f2d56

- honour per-instance NIC link setting for openvswitch networks
---

diff --git a/ganeti.spec b/ganeti.spec
index 4156d64..e487116 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -1,7 +1,7 @@
 Summary:	Cluster-based virtualization management software
 Name:		ganeti
 Version:	2.9.3
-Release:	0.6
+Release:	0.7
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.ganeti.org/releases/2.9/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch0:		fix-no-kvm.patch
 Patch1:		systemd.patch
 Patch2:		daemon-util-use-service.patch
 Patch3:		mtl.patch
+Patch4:		use-vm-openvswitch-link.patch
 URL:		https://code.google.com/p/ganeti/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -123,6 +124,7 @@ bash-completion for ganeti.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I autotools
diff --git a/use-vm-openvswitch-link.patch b/use-vm-openvswitch-link.patch
new file mode 100644
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]