[vdsm/f19] vdsm-4.10.3-18 - vdsm.spec: update python-pthreading - service: make iscsid a systemd dependency - s
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Wed Jul 10 19:11:33 UTC 2013
commit 30595c2940b7751fdc57e514dc80870a1b68f640
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Wed Jul 10 16:10:30 2013 -0300
vdsm-4.10.3-18
- vdsm.spec: update python-pthreading
- service: make iscsid a systemd dependency
- spec updates.
0052-vdsm.spec-update-python-pthreading.patch | 56 ++++++++++++++++++++
...-service-make-iscsid-a-systemd-dependency.patch | 47 ++++++++++++++++
vdsm.spec | 21 ++++++-
3 files changed, 121 insertions(+), 3 deletions(-)
---
diff --git a/0052-vdsm.spec-update-python-pthreading.patch b/0052-vdsm.spec-update-python-pthreading.patch
new file mode 100644
index 0000000..9c6d373
--- /dev/null
+++ b/0052-vdsm.spec-update-python-pthreading.patch
@@ -0,0 +1,56 @@
+From 3f66bb373d43072de4a3e39019e0d7df9791f274 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Fri, 14 Jun 2013 02:47:26 -0400
+Subject: [PATCH] vdsm.spec: update python-pthreading
+
+F19 and EL7 should require python-pthreading >= 1.0.2
+
+Change-Id: Ie50a5b7a794b9df135478f3adace7501893d992c
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/15705
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index 9a44260..8c00001 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -93,7 +93,6 @@ Requires: iproute
+ Requires: python-ethtool
+ Requires: rpm-python
+ Requires: nfs-utils
+-Requires: python-pthreading
+ Requires: m2crypto
+ Requires: %{name}-xmlrpc = %{version}-%{release}
+
+@@ -112,6 +111,7 @@ Requires: iscsi-initiator-utils
+ Requires: libvirt
+ Requires: lvm2
+ Requires: python
++Requires: python-pthreading >= 0.1.2
+ Requires: qemu-kvm
+ Requires: qemu-kvm-img
+ Requires: sanlock, sanlock-python
+@@ -130,14 +130,17 @@ Requires: kernel >= 2.6.32-279.9.1
+ Requires: sanlock >= 2.3-4, sanlock-python
+ Requires: initscripts >= 9.03.31-2.el6_3.1
+ Requires: mom >= 0.3.0
++Requires: python-pthreading
+ Requires: selinux-policy-targeted >= 3.7.19-80
+ Requires: lvm2 >= 2.02.95-10.el6_3.2
+ Requires: logrotate < 3.8.0
+ %endif
+ %else
+ %if 0%{?fedora} >= 19
++Requires: python-pthreading >= 0.1.2
+ Requires: fence-agents-all
+ %else
++Requires: python-pthreading
+ Requires: fence-agents
+ %endif
+ # Subprocess and thread bug was found on python 2.7.2
+--
+1.8.2.1
+
diff --git a/0053-service-make-iscsid-a-systemd-dependency.patch b/0053-service-make-iscsid-a-systemd-dependency.patch
new file mode 100644
index 0000000..2349dc8
--- /dev/null
+++ b/0053-service-make-iscsid-a-systemd-dependency.patch
@@ -0,0 +1,47 @@
+From 73463217963c3c138fdac822a092fc68b8541b8a Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Mon, 8 Jul 2013 20:50:50 -0400
+Subject: [PATCH] service: make iscsid a systemd dependency
+
+Also remove starting iscsid with force-start as it is no longer
+supported
+
+master commit 3c0adf791e790c820d44317204f275aa09513318
+
+Change-Id: I461cf35763c495b0630acf9d4a7c8716036ad41e
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=981906
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/16527
+Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
+---
+ vdsm/vdsmd.init.in | 1 -
+ vdsm/vdsmd.service | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
+index c8223d3..9789437 100755
+--- a/vdsm/vdsmd.init.in
++++ b/vdsm/vdsmd.init.in
+@@ -158,7 +158,6 @@ start_needed_srv() {
+ fi
+ done
+
+- /sbin/service iscsid force-start
+ }
+
+ test_lo() {
+diff --git a/vdsm/vdsmd.service b/vdsm/vdsmd.service
+index 9823b34..9ed69ba 100644
+--- a/vdsm/vdsmd.service
++++ b/vdsm/vdsmd.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Virtual Desktop Server Manager
+-Requires=multipathd.service libvirtd.service time-sync.target
++Requires=multipathd.service libvirtd.service time-sync.target iscsid.service
+ Conflicts=libvirt-guests.service
+
+ [Service]
+--
+1.8.2.1
+
diff --git a/vdsm.spec b/vdsm.spec
index 26054a2..0acce9f 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -45,7 +45,7 @@
Name: %{vdsm_name}
Version: 4.10.3
-Release: 17%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release: 18%{?vdsm_relvtag}%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -114,6 +114,8 @@ Patch47: 0048-Makefile.am-ignore-false-positive-pyflakes-lvm.py.patch
Patch48: 0049-Deactivate-libvirtVM.Drives.patch
Patch49: 0050-vdsm-fix-Vm-cleanup-routine.patch
Patch50: 0051-Support-teardownVolumePath-None.patch
+Patch51: 0052-vdsm.spec-update-python-pthreading.patch
+Patch52: 0053-service-make-iscsid-a-systemd-dependency.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -162,7 +164,6 @@ Requires: iproute
Requires: python-ethtool
Requires: rpm-python
Requires: nfs-utils
-Requires: python-pthreading
Requires: m2crypto
Requires: %{name}-xmlrpc = %{version}-%{release}
@@ -181,6 +182,7 @@ Requires: iscsi-initiator-utils
Requires: libvirt
Requires: lvm2
Requires: python
+Requires: python-pthreading >= 0.1.2
Requires: qemu-kvm
Requires: qemu-kvm-img
Requires: sanlock, sanlock-python
@@ -199,14 +201,17 @@ Requires: kernel >= 2.6.32-279.9.1
Requires: sanlock >= 2.3-4, sanlock-python
Requires: initscripts >= 9.03.31-2.el6_3.1
Requires: mom >= 0.3.0
+Requires: python-pthreading
Requires: selinux-policy-targeted >= 3.7.19-80
Requires: lvm2 >= 2.02.95-10.el6_3.2
Requires: logrotate < 3.8.0
%endif
%else
%if 0%{?fedora} >= 19
+Requires: python-pthreading >= 0.1.2
Requires: fence-agents-all
%else
+Requires: python-pthreading
Requires: fence-agents
%endif
# Subprocess and thread bug was found on python 2.7.2
@@ -557,6 +562,12 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%patch44 -p1
%patch45 -p1
%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
%if 0%{?rhel} == 6
sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1188,6 +1199,10 @@ exit 0
%changelog
+* Wed Jul 10 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-18
+- vdsm.spec: update python-pthreading
+- service: make iscsid a systemd dependency
+
* Tue Jun 4 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-17
- Makefile.am: ignore false positive pyflakes lvm.py
- Deactivate libvirtVM.Drives()
@@ -1214,7 +1229,7 @@ exit 0
* Wed Apr 3 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-13
- Temporarily deactivate Gluster sub-package.
-* Mon Mar 26 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-12
+* Tue Mar 26 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-12
- Applying direct to spec the fence-agents changes and removing the patch.
* Mon Mar 25 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-11
More information about the scm-commits
mailing list