[vdsm] vdsm 4.16.4
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Wed Sep 10 20:44:06 UTC 2014
commit 0df834649ad98f599dfa4a478e00f768cd0134f3
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Wed Sep 10 16:43:48 2014 -0400
vdsm 4.16.4
sources | 2 +-
vdsm.spec | 83 +++++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 52 insertions(+), 33 deletions(-)
---
diff --git a/sources b/sources
index b64362a..f40d509 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c6163cbfeb369ebfbd6c4f3ba5b814f vdsm-4.16.0.tar.gz
+434579d3fc056b5ccb93586c8817c826 vdsm-4.16.4.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index bd72132..dd9223b 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -45,14 +45,20 @@
%global with_systemd 1
%endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%global with_systemd_macros 1
%global with_tmpfiles_macro 1
%endif
+%if 0%{?rhel} == 6
+%global _udevrulesdir /lib/udev/rules.d/
+%else
+%global _udevrulesdir /usr/lib/udev/rules.d/
+%endif
+
Name: %{vdsm_name}
-Version: 4.16.0
-Release: 7.git5d3ed2d%{?dist}%{?extra_release}
+Version: 4.16.4
+Release: 0%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -69,12 +75,14 @@ Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: x86_64 ppc64
BuildRequires: gcc
BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python-netaddr
BuildRequires: rpm-build
+BuildRequires: cyrus-sasl-lib
# BuildRequires needed by the tests during the build
BuildRequires: dosfstools
@@ -83,7 +91,7 @@ BuildRequires: python-ethtool
BuildRequires: python-inotify
BuildRequires: python-pthreading
BuildRequires: python-cpopen >= 1.3
-BuildRequires: python-ioprocess >= 0.5-1
+BuildRequires: python-ioprocess >= 0.12
BuildRequires: rpm-python
BuildRequires: libnl
BuildRequires: libselinux-python
@@ -91,9 +99,6 @@ BuildRequires: libvirt-python
BuildRequires: genisoimage
BuildRequires: openssl
BuildRequires: m2crypto
-%ifarch x86_64
-BuildRequires: python-dmidecode
-%endif
%if 0%{?rhel} == 6
BuildRequires: python-argparse
BuildRequires: python-ordereddict
@@ -127,7 +132,8 @@ Requires: python-netaddr
Requires: python-inotify
Requires: python-argparse
Requires: python-cpopen >= 1.3
-Requires: python-ioprocess >= 0.5-1
+Requires: python-ioprocess >= 0.12
+Requires: python-pthreading >= 0.1.3-3
Requires: python-ethtool >= 0.6-3
Requires: %{name}-python-zombiereaper = %{version}-%{release}
Requires: rpm-python
@@ -176,22 +182,20 @@ Requires: sanlock >= 2.8, sanlock-python
%if 0%{?rhel}
Requires: python-ethtool >= 0.6-3
%if 0%{?rhel} >= 7
-ExclusiveArch: x86_64 ppc64
Requires: device-mapper-multipath
Requires: e2fsprogs
Requires: fence-agents-all
Requires: lvm2
Requires: python
Requires: policycoreutils-python
-Requires: python-pthreading >= 0.1.2
-Requires: qemu-kvm
-Requires: qemu-img
+Requires: qemu-kvm-rhev
+Requires: qemu-img-rhev
Requires: selinux-policy-targeted
%else
Requires: python
-# Update the qemu-kvm requires when block_stream will be included
-Requires: qemu-kvm >= 2:0.12.1.2-2.295.el6_3.4
-Requires: qemu-img >= 2:0.12.1.2-2.295.el6_3.4
+# Update the qemu-kvm-rhev requires when block_stream will be included
+Requires: qemu-kvm-rhev >= 2:0.12.1.2-2.415.el6_5.3
+Requires: qemu-img-rhev >= 2:0.12.1.2-2.415.el6_5.3
Requires: device-mapper-multipath >= 0.4.9-52
Requires: e2fsprogs >= 1.41.12-11
Requires: fence-agents
@@ -199,13 +203,11 @@ Requires: kernel >= 2.6.32-279.9.1
Requires: initscripts >= 9.03.31-2.el6_3.1
Requires: policycoreutils >= 2.0.83-19.30
Requires: policycoreutils-python >= 2.0.83-19.30
-Requires: python-pthreading
Requires: selinux-policy-targeted >= 3.7.19-195.el6_4.13
Requires: lvm2 >= 2.02.100-5
Requires: logrotate < 3.8.0
%endif
%else
-Requires: python-pthreading >= 0.1.2
Requires: fence-agents-all
Requires: kernel >= 3.11.3-201
# Subprocess and thread bug was found on python 2.7.2
@@ -341,7 +343,8 @@ Summary: VDSM python libraries
Requires: %{name}-python-zombiereaper = %{version}-%{release}
Requires: python-cpopen >= 1.2.3-5
Requires: m2crypto
-Requires: python-ioprocess >= 0.5-1
+Requires: python-ioprocess >= 0.12
+BuildArch: noarch
%description python
Shared libraries between the various VDSM packages.
@@ -648,7 +651,7 @@ make DESTDIR=%{buildroot} install
# Creating VDSM logs in this session to avoid rpmbuild
# complain during the build
install -dDm 0755 %{buildroot}/var/log/vdsm
-touch %{buildroot}/var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
+touch %{buildroot}/var/log/vdsm/{connectivity.log,mom.log,supervdsm.log,vdsm.log}
# Install the respawn utility
install -Dm 0755 init/sysvinit/respawn \
@@ -656,18 +659,18 @@ install -Dm 0755 init/sysvinit/respawn \
# Install the lvm rules
install -Dm 0644 vdsm/storage/vdsm-lvm.rules \
- %{buildroot}/lib/udev/rules.d/12-vdsm-lvm.rules
+ %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules
install -Dm 0644 vdsm/limits.conf \
%{buildroot}/etc/security/limits.d/99-vdsm.conf
%if 0%{?with_systemd}
-install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}/lib/systemd/systemd-vdsmd
+install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}/usr/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 0755 vdsm_reg/vdsm-reg.init \
- %{buildroot}/lib/systemd/systemd-vdsm-reg
+ %{buildroot}/usr/lib/systemd/systemd-vdsm-reg
install -Dm 0644 vdsm_reg/vdsm-reg.service \
%{buildroot}%{_unitdir}/vdsm-reg.service
install -Dm 0644 vdsm/vdsm-modules-load.d.conf \
@@ -720,7 +723,7 @@ export LC_ALL=C
/usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
%post
-%{_bindir}/vdsm-tool configure --module sanlock --force
+%{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null
%{_bindir}/vdsm-tool sebool-config || :
# set the vdsm "secret" password for libvirt
%{_bindir}/vdsm-tool set-saslpasswd
@@ -728,9 +731,9 @@ export LC_ALL=C
# After vdsm install we should create the logs files.
# In the install session we create it but since we use
# the ghost macro (in files session) the files are not included
-touch /var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
-chmod 0644 /var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
-chown vdsm:kvm /var/log/vdsm/{mom.log,vdsm.log}
+touch /var/log/vdsm/{connectivity.log,mom.log,supervdsm.log,vdsm.log}
+chmod 0644 /var/log/vdsm/{connectivity.log,mom.log,supervdsm.log,vdsm.log}
+chown vdsm:kvm /var/log/vdsm/{connectivity.log,mom.log,vdsm.log}
chown root:root /var/log/vdsm/supervdsm.log
# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf.
@@ -753,6 +756,14 @@ if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add supervdsmd
fi
%else
+# multipath.conf does not exists after multipath install, causing multipathd to
+# exit silently when started as vdsmd required service. This creates default
+# configuration blacklisting all devices, simulating the behavior of multipathd
+# on EL6 when configuration file is missing.
+# See https://bugzilla.redhat.com/1120209
+if [ ! -f "/etc/multipath.conf" ]; then
+ /usr/sbin/mpathconf --disable
+fi
/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
if [ "$1" -eq 1 ] ; then
/bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
@@ -828,7 +839,7 @@ if [ "$1" -ge 1 ]; then
# fallback to vdsmd reconfigure api - This change may be removed
# when vdsm won't support any downgrade\upgrade to versions that
# don't include vdsm-tool configure api (vdsm <= 3.3)
- for f in '/lib/systemd/systemd-vdsmd' '/etc/init.d/vdsmd'; do
+ for f in '/usr/lib/systemd/systemd-vdsmd' '/etc/init.d/vdsmd'; do
if [ -f "${f}" ]; then
"${f}" reconfigure >/dev/null 2>&1 || :
fi
@@ -900,7 +911,7 @@ exit 0
%defattr(-, root, root, -)
%doc COPYING README lib/vdsm/vdsm.conf.sample
%if 0%{?with_systemd}
-/lib/systemd/systemd-vdsmd
+/usr/lib/systemd/systemd-vdsmd
%{_unitdir}/vdsmd.service
%{_unitdir}/supervdsmd.service
%else
@@ -909,6 +920,7 @@ exit 0
%endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center
+%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/connectivity.log
%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/mom.log
%ghost %config %attr(0644, root, root) /var/log/vdsm/supervdsm.log
%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/vdsm.log
@@ -961,7 +973,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
-%config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
+%config(noreplace) %{_sysconfdir}/%{vdsm_name}/logrotate/vdsm
%config(noreplace) %{_sysconfdir}/rwtab.d/vdsm
%config(noreplace) %{_sysconfdir}/sysctl.d/vdsm.conf
%if 0%{?with_systemd}
@@ -1117,7 +1129,7 @@ exit 0
%exclude %{_datadir}/%{vdsm_name}/gluster/*
%endif
%{python_sitelib}/sos/plugins/vdsm.py*
-/lib/udev/rules.d/12-vdsm-lvm.rules
+%{_udevrulesdir}/12-vdsm-lvm.rules
/etc/security/limits.d/99-vdsm.conf
%{_mandir}/man8/vdsmd.8*
%if 0%{?rhel}
@@ -1181,7 +1193,11 @@ exit 0
%{python_sitearch}/%{vdsm_name}/tool/dummybr.py*
%{python_sitearch}/%{vdsm_name}/tool/nwfilter.py*
%{python_sitearch}/%{vdsm_name}/tool/configurator.py*
-%{python_sitearch}/%{vdsm_name}/tool/configfile.py*
+%{python_sitearch}/%{vdsm_name}/tool/configurators/__init__*
+%{python_sitearch}/%{vdsm_name}/tool/configurators/configfile.py*
+%{python_sitearch}/%{vdsm_name}/tool/configurators/certificates.py*
+%{python_sitearch}/%{vdsm_name}/tool/configurators/libvirt.py*
+%{python_sitearch}/%{vdsm_name}/tool/configurators/sanlock.py*
%{python_sitearch}/%{vdsm_name}/tool/passwd.py*
%{python_sitearch}/%{vdsm_name}/tool/restore_nets.py*
%{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py*
@@ -1447,7 +1463,7 @@ exit 0
%ghost %dir /data
%ghost %dir %attr(0775, root, root) /data/updates
%if 0%{?with_systemd}
-/lib/systemd/systemd-vdsm-reg
+/usr/lib/systemd/systemd-vdsm-reg
%{_unitdir}/vdsm-reg.service
%else
%{_initrddir}/vdsm-reg
@@ -1488,6 +1504,9 @@ exit 0
%endif
%changelog
+* Wed Sep 10 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.16.4-0
+- vdsm tag 4.16.4
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.16.0-7.git5d3ed2d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list