[vdsm] update to 4.13.0-9
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Tue Nov 5 16:42:56 UTC 2013
commit 8fc34a90c2101702b595a070f2792aa9e16967b7
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Tue Nov 5 11:42:37 2013 -0500
update to 4.13.0-9
...init-no-need-to-stop-conflicting-services.patch | 38 -------
...Add-service-is-managed-in-shutdown_confli.patch | 32 ------
...Sharing-return-proper-size-in-httpGetSize.patch | 47 --------
...equire-libvirt-that-allows-vmUpdateDevice.patch | 31 -----
...nderlyingDriveInfo-extract-path-of-gluste.patch | 41 -------
...andler-Add-create-exclusive-option-for-tr.patch | 41 -------
0007-oop-improve-safety-for-truncateFile.patch | 105 ------------------
sources | 2 +-
vdsm.spec | 116 +++++++++++---------
9 files changed, 63 insertions(+), 390 deletions(-)
---
diff --git a/sources b/sources
index 4b8ec82..f7155f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b09314cd4aa11b102ea6187f1dcbd4f vdsm-4.12.1.tar.gz
+142e847e85f23233dfdfef601b3badbb vdsm-4.13.0.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 8245a38..330a2e8 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -45,8 +45,8 @@
%endif
Name: %{vdsm_name}
-Version: 4.12.1
-Release: 5%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Version: 4.13.0
+Release: 9%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -61,14 +61,6 @@ Url: http://www.ovirt.org/wiki/Vdsm
# make VERSION={version}-{vdsm_release} dist
Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
-Patch1: 0001-systemd-init-no-need-to-stop-conflicting-services.patch
-Patch2: 0002-vdsmd.init-Add-service-is-managed-in-shutdown_confli.patch
-Patch3: 0003-imageSharing-return-proper-size-in-httpGetSize.patch
-Patch4: 0004-Require-libvirt-that-allows-vmUpdateDevice.patch
-Patch5: 0005-vm.Vm._getUnderlyingDriveInfo-extract-path-of-gluste.patch
-Patch6: 0006-remoteFileHandler-Add-create-exclusive-option-for-tr.patch
-Patch7: 0007-oop-improve-safety-for-truncateFile.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -118,6 +110,7 @@ Requires: ntp
Requires: iproute
Requires: python-netaddr
Requires: python-inotify
+Requires: python-argparse
Requires: python-ethtool >= 0.6-3
Requires: rpm-python
Requires: nfs-utils
@@ -139,7 +132,7 @@ Requires: libvirt-daemon-driver-nwfilter
Requires: libvirt-daemon-driver-qemu
%else
%if 0%{?rhel}
-Requires: libvirt >= 0.10.2-18.el6_4.4
+Requires: libvirt >= 0.10.2-18.el6_4.10
%else
Requires: libvirt >= 1.0.2-1
%endif
@@ -204,15 +197,14 @@ Requires: kernel >= 3.6
Requires: sanlock >= 2.4-2, sanlock-python
Requires: policycoreutils-python
Requires: sed >= 4.2.1-10
-Requires: selinux-policy-targeted >= 3.10.0-149
+Requires: ed
Requires: lvm2 >= 2.02.95
-%endif
%if 0%{?fedora} >= 18
%if 0%{?fedora} >= 19
-Requires: selinux-policy-targeted >= 3.12.1-69
+Requires: selinux-policy-targeted >= 3.12.1-71
%else
-Requires: selinux-policy-targeted >= 3.11.1-100
+Requires: selinux-policy-targeted >= 3.11.1-103
%endif
# In order to avoid a policycoreutils bug (rhbz 889698) when selinux is
# disabled we now require the version 2.1.13-55 (or newer) of Fedora.
@@ -220,6 +212,8 @@ Requires: policycoreutils >= 2.1.13-55
Requires: systemd >= 197-1.fc18.2
%endif
+%endif
+
# GlusterFS client-side RPMs needed for Gluster SD
%if 0%{?with_gluster}
Requires: glusterfs >= 3.4.0
@@ -326,6 +320,8 @@ Manager.
Summary: Creates a sub-process in simpler safer manner.
BuildRequires: python2-devel
+Provides: python-cpopen = %{version}-%{release}
+Obsoletes: python-cpopen
%description python-cpopen
Python package for creating sub-process in simpler and safer manner by using C
@@ -397,7 +393,9 @@ Summary: Disables MAC spoofing filtering
BuildArch: noarch
%description hook-macspoof
-VDSM hook that disables mac spoof filtering on all the of the VM's interfaces.
+VDSM hooks which allow to disable mac spoof filtering
+either on all the of the VM's interfaces or on
+specific vnics.
%package hook-fileinject
Summary: Allow uploading file to VMs disk
@@ -547,10 +545,7 @@ Summary: Gluster Plugin for VDSM
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
-Requires: glusterfs >= 3.4.0
Requires: glusterfs-server
-Requires: glusterfs-fuse
-Requires: glusterfs-rdma
Requires: python-magic
%description gluster
@@ -559,14 +554,6 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
%if 0%{?rhel} == 6
sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
%endif
@@ -590,23 +577,22 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
# Install the respawn utility
-install -Dm 0755 vdsm/respawn \
+install -Dm 0755 init/sysvinit/respawn \
%{buildroot}%{_datadir}/%{vdsm_name}/respawn
# Install the lvm rules
-install -Dm 0644 vdsm/storage/12-vdsm-lvm.rules \
+install -Dm 0644 vdsm/storage/vdsm-lvm.rules \
%{buildroot}/lib/udev/rules.d/12-vdsm-lvm.rules
install -Dm 0644 vdsm/limits.conf \
%{buildroot}/etc/security/limits.d/99-vdsm.conf
%if 0%{?with_systemd}
-# Install the systemd scripts
-install -Dm 0755 vdsm/vdsmd.init %{buildroot}/lib/systemd/systemd-vdsmd
-install -Dm 0644 vdsm/vdsmd.service %{buildroot}%{_unitdir}/vdsmd.service
-install -Dm 0644 vdsm/supervdsmd.service %{buildroot}%{_unitdir}/supervdsmd.service
+install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}/lib/systemd/systemd-vdsmd
+install -Dm 0644 init/systemd/vdsmd.service %{buildroot}%{_unitdir}/vdsmd.service
+install -Dm 0644 init/systemd/supervdsmd.service %{buildroot}%{_unitdir}/supervdsmd.service
-install -Dm 0644 vdsm/vdsm-restore-net-config.service \
+install -Dm 0644 init/systemd/vdsm-restore-net-config.service \
%{buildroot}%{_unitdir}/vdsm-restore-net-config.service
install -Dm 0755 vdsm_reg/vdsm-reg.init \
%{buildroot}/lib/systemd/systemd-vdsm-reg
@@ -616,16 +602,16 @@ install -Dm 0644 vdsm/vdsm-modules-load.d.conf \
%{buildroot}%{_sysconfdir}/modules-load.d/vdsm.conf
%else
# Install the SysV init scripts
-install -Dm 0755 vdsm/vdsmd.init %{buildroot}%{_initrddir}/vdsmd
-install -Dm 0755 vdsm/supervdsmd.init %{buildroot}%{_initrddir}/supervdsmd
+install -Dm 0755 init/sysvinit/vdsmd.init %{buildroot}%{_initrddir}/vdsmd
+install -Dm 0755 init/sysvinit/supervdsmd.init %{buildroot}%{_initrddir}/supervdsmd
install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg
-install -Dm 0755 vdsm/vdsm-restore-net-config.init \
+install -Dm 0755 init/sysvinit/vdsm-restore-net-config.init \
%{buildroot}%{_initrddir}/vdsm-restore-net-config
%endif
%if 0%{?with_tmpfiles_macro}
-install -Dm 0644 vdsm/vdsm-tmpfiles.d.conf \
+install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
%{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
%endif
@@ -683,6 +669,11 @@ if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsmd
/sbin/chkconfig --add supervdsmd
/sbin/chkconfig --add vdsm-restore-net-config
+
+ # drop this ugly hack when selinux-policy-3.7.19-195.el6.13 is released
+ /usr/sbin/semanage fcontext -a -s system_u -t virt_var_run_t -r s0 \
+ '/var/run/vdsm(/.*)?'
+ /sbin/restorecon /var/run/vdsm
fi
%else
%if 0%{?with_systemd}
@@ -758,24 +749,30 @@ exit 0
%endif
%postun
-%if 0%{?rhel}
if [ "$1" -ge 1 ]; then
- /sbin/service vdsmd condrestart > /dev/null 2>&1
- /sbin/service supervdsmd condrestart > /dev/null 2>&1
-fi
-exit 0
-%else
-%if 0%{?with_systemd_macros}
-%systemd_postun_with_restart vdsmd.service
-%systemd_postun_with_restart supervdsmd.service
-%else
-if [ "$1" -ge 1 ] ; then
- /bin/systemctl try-restart vdsmd.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart supervdsmd.service >/dev/null 2>&1 || :
+ supervdsmd_start_required='no'
+ vdsmd_start_required='no'
+ if %{_bindir}/vdsm-tool service-status vdsmd >/dev/null 2>&1; then
+ %{_bindir}/vdsm-tool service-stop vdsmd >/dev/null 2>&1
+ vdsmd_start_required='yes'
+ fi
+ if %{_bindir}/vdsm-tool service-status supervdsmd >/dev/null 2>&1; then
+ %{_bindir}/vdsm-tool service-stop supervdsmd >/dev/null 2>&1
+ supervdsmd_start_required='yes'
+ fi
+ if %{_bindir}/vdsm-tool libvirt-configure | grep -q 'is done.'; then
+ if %{_bindir}/vdsm-tool service-status libvirtd >/dev/null 2>&1; then
+ %{_bindir}/vdsm-tool service-restart libvirtd >/dev/null 2>&1
+ fi
+ fi
+ if [ "${supervdsmd_start_required}" = 'yes' ]; then
+ %{_bindir}/vdsm-tool service-start supervdsmd >/dev/null 2>&1
+ fi
+ if [ "${vdsmd_start_required}" = 'yes' ]; then
+ %{_bindir}/vdsm-tool service-start vdsmd >/dev/null 2>&1
+ fi
fi
exit 0
-%endif
-%endif
%if 0%{?rhel}
%triggerun -- libvirt
@@ -852,6 +849,7 @@ exit 0
%{_datadir}/%{vdsm_name}/blkid.py*
%{_datadir}/%{vdsm_name}/caps.py*
%{_datadir}/%{vdsm_name}/clientIF.py*
+%{_datadir}/%{vdsm_name}/daemonAdapter
%{_datadir}/%{vdsm_name}/dmidecodeUtil.py*
%{_datadir}/%{vdsm_name}/API.py*
%{_datadir}/%{vdsm_name}/hooking.py*
@@ -864,7 +862,7 @@ exit 0
%{_datadir}/%{vdsm_name}/sourceRoute.py*
%{_datadir}/%{vdsm_name}/sourceRouteThread.py*
%{_datadir}/%{vdsm_name}/supervdsm.py*
-%{_datadir}/%{vdsm_name}/supervdsmServer.py*
+%{_datadir}/%{vdsm_name}/supervdsmServer
%{_datadir}/%{vdsm_name}/vmChannels.py*
%{_datadir}/%{vdsm_name}/tc.py*
%{_datadir}/%{vdsm_name}/vdsm
@@ -897,6 +895,7 @@ exit 0
%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
%{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh
+%{_libexecdir}/%{vdsm_name}/vdsmd_init_common.sh
%{_datadir}/%{vdsm_name}/storage/__init__.py*
%{_datadir}/%{vdsm_name}/storage/blockSD.py*
%{_datadir}/%{vdsm_name}/storage/blockVolume.py*
@@ -1039,6 +1038,7 @@ exit 0
%dir %{_sysconfdir}/pki/%{vdsm_name}
%dir %{_sysconfdir}/pki/%{vdsm_name}/keys
%dir %{_sysconfdir}/pki/%{vdsm_name}/certs
+%dir %{_sysconfdir}/pki/%{vdsm_name}/libvirt-spice
%config(noreplace) %{_sysconfdir}/pki/%{vdsm_name}/keys/libvirt_password
%dir %{_localstatedir}/lib/%{vdsm_name}
%dir %{_localstatedir}/lib/%{vdsm_name}/netconfback
@@ -1101,10 +1101,13 @@ exit 0
%if 0%{?with_gluster}
%{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml
%{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
+%{_datadir}/%{vdsm_name}/tests/glusterVolumeRebalanceStatus.xml
+%{_datadir}/%{vdsm_name}/tests/glusterVolumeRemoveBricksStatus.xml
%else
%exclude %{_datadir}/%{vdsm_name}/tests/gluster*
%endif
%{_datadir}/%{vdsm_name}/tests/functional/*.py*
+%{_datadir}/%{vdsm_name}/tests/functional/*.policy
%files hook-openstacknet
%defattr(-, root, root, -)
@@ -1177,6 +1180,8 @@ exit 0
%files hook-macspoof
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
%files hook-nestedvt
%defattr(-, root, root, -)
@@ -1321,6 +1326,9 @@ exit 0
%attr(755, root, root) %{python_sitearch}/cpopen/cpopen.so*
%changelog
+* Tue Nov 05 2013 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.0-9
+- Build 4.13.0-9 from branch ovirt-3.3
+
* Wed Oct 30 2013 Cole Robinson <crobinso at redhat.com> - 4.12.1-5
- Fix broken hostname dep on rawhide
More information about the scm-commits
mailing list