[vdsm/f21] Build vdsm 4.16.10 - oVirt 3.5
Yaniv Bronhaim
bronhaim at fedoraproject.org
Sun Dec 28 15:24:18 UTC 2014
commit 283bab601d517e0d7704080844a7d6fd057fe9a6
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date: Sun Dec 28 17:24:04 2014 +0200
Build vdsm 4.16.10 - oVirt 3.5
sources | 2 +-
vdsm.spec | 156 ++++++++++++++++++++++++++++++++++++++----------------------
2 files changed, 100 insertions(+), 58 deletions(-)
---
diff --git a/sources b/sources
index 5513cee..bc5af76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b750b144d7291dde53ccf21d90ba82bf vdsm-4.16.5.tar.gz
+ecd41e7482c6233cfd4deefc808562ac vdsm-4.16.10.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index d740f91..6036563 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -21,11 +21,19 @@
%global fedora_koji_build 1
%global with_hooks 1
+# RHEV build - overridable using rpmbuild --define "rhev_build 1"
+%{!?rhev_build: %global rhev_build 0}
+
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
%{!?enable_autotools:%define enable_autotools 1}
+# Skips check since rhel default repos lack pep8 and pyflakes
+%if ! 0%{?rhel}
+%global with_check 1
+%endif
+
# Required paths
%if 0%{?fedora} >= 18
%global _polkitdir %{_datadir}/polkit-1/rules.d
@@ -50,15 +58,21 @@
%global with_tmpfiles_macro 1
%endif
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%global with_chown_hack 1
+%endif
+
%if 0%{?rhel} == 6
%global _udevrulesdir /lib/udev/rules.d/
+%global _udevexecdir /lib/udev/
%else
%global _udevrulesdir /usr/lib/udev/rules.d/
+%global _udevexecdir /usr/lib/udev/
%endif
Name: %{vdsm_name}
-Version: 4.16.5
-Release: 5.gitb16b036%{?dist}%{?extra_release}
+Version: 4.16.10
+Release: 0%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -95,16 +109,19 @@ BuildRequires: python-inotify
BuildRequires: python-pthreading
BuildRequires: python-cpopen >= 1.3
BuildRequires: python-ioprocess >= 0.12
+BuildRequires: qemu-img
BuildRequires: rpm-python
BuildRequires: libnl
BuildRequires: libselinux-python
BuildRequires: libvirt-python
BuildRequires: genisoimage
BuildRequires: openssl
+BuildRequires: policycoreutils-python
BuildRequires: m2crypto
%if 0%{?rhel} == 6
BuildRequires: python-argparse
BuildRequires: python-ordereddict
+BuildRequires: python-simplejson >= 2.0.9
%endif
# Autotools BuildRequires
@@ -115,7 +132,7 @@ BuildRequires: gettext-devel
BuildRequires: libtool
%endif
-%if !0%{?rhel}
+%if 0%{?with_check}
BuildRequires: pyflakes
BuildRequires: python-pep8
%endif
@@ -146,7 +163,13 @@ Requires: libguestfs-tools-c
Requires: libnl
Requires: %{name}-xmlrpc = %{version}-%{release}
Requires: %{name}-jsonrpc = %{version}-%{release}
-Requires: mom >= 0.4.1
+
+%if 0%{?rhev_build}
+Requires: mom >= 0.4.1-4
+%else
+Requires: mom >= 0.4.3
+%endif
+
# Numactl is not available on s390[x] and ARM
%ifnarch s390 s390x %{arm}
Requires: numactl
@@ -194,7 +217,7 @@ Requires: fence-agents-all
Requires: lvm2
Requires: python
Requires: policycoreutils-python
-Requires: selinux-policy-targeted
+Requires: selinux-policy-targeted >= 3.12.1-153.el7_0.13
%else
Requires: python
Requires: device-mapper-multipath >= 0.4.9-52
@@ -203,8 +226,8 @@ Requires: fence-agents
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: selinux-policy-targeted >= 3.7.19-195.el6_4.13
+Requires: policycoreutils-python >= 2.0.83-19.47.el6_6.1
+Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.1
Requires: lvm2 >= 2.02.100-5
Requires: logrotate < 3.8.0
%endif
@@ -311,6 +334,7 @@ Requires: %{name}-yajsonrpc = %{version}-%{release}
Obsoletes: vdsm-api < 4.16
%if 0%{?rhel} == 6
Requires: python-ordereddict
+Requires: python-simplejson >= 2.0.9
%endif
%description jsonrpc
@@ -651,7 +675,7 @@ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
%if 0%{?enable_autotools}
autoreconf -if
%endif
-%configure %{?with_hooks:--enable-hooks}
+%configure %{?with_hooks:--enable-hooks} %{?with_chown_hack:--enable-chown-hack}
make
# Setting software_version and software_revision in dsaversion.py
baserelease=`echo "%{release}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'`
@@ -727,10 +751,9 @@ install -Dm 0755 vdsm/virt/libvirt-hook.sh \
%endif
%check
-# Disabling the nose tests until they'll all succeed in koji.
-# make check is failing on F-18+ due to pep8 issues. See RHBZ # 837014
-# make check NOSE_EXCLUDE=".*"
-#make check
+%if 0%{?with_check}
+make check
+%endif
%clean
rm -rf %{buildroot}
@@ -745,11 +768,19 @@ export LC_ALL=C
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user}
/usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
+# We keep the previous rpm version number in a file for managing upgrade flow
+# in vdsmd_init_script upgraded_version_check task
+if [ "$1" -gt 1 ]; then
+ rpm -q %{vdsm_name} > "%{_localstatedir}/lib/%{vdsm_name}/upgraded_version"
+fi
+
%post
%{_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
+# update the vdsm "secret" password for libvirt
+if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then
+ /usr/sbin/saslpasswd2 -p -a libvirt vdsm at ovirt < \
+ /etc/pki/vdsm/keys/libvirt_password
+fi
# After vdsm install we should create the logs files.
# In the install session we create it but since we use
@@ -812,8 +843,6 @@ then
/bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
/etc/sysctl.conf
- %{_bindir}/vdsm-tool sebool-unconfig || :
-
%{_bindir}/vdsm-tool remove-saslpasswd
if /sbin/initctl status libvirtd >/dev/null 2>/dev/null ; then
@@ -985,10 +1014,12 @@ exit 0
%{_datadir}/%{vdsm_name}/virt/migration.py*
%{_datadir}/%{vdsm_name}/virt/vmchannels.py*
%{_datadir}/%{vdsm_name}/virt/vmstatus.py*
+%{_datadir}/%{vdsm_name}/virt/vmtune.py*
%{_datadir}/%{vdsm_name}/virt/vm.py*
%{_datadir}/%{vdsm_name}/virt/vmexitreason.py*
%{_datadir}/%{vdsm_name}/virt/vmpowerdown.py*
%{_datadir}/%{vdsm_name}/virt/sampling.py*
+%{_datadir}/%{vdsm_name}/virt/utils.py*
%{_datadir}/%{vdsm_name}/tool
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
@@ -1015,6 +1046,7 @@ exit 0
%{_datadir}/%{vdsm_name}/logUtils.py*
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_libexecdir}/%{vdsm_name}/curl-img-wrap
+%{_libexecdir}/%{vdsm_name}/fc-scan
%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
@@ -1176,6 +1208,7 @@ exit 0
%dir %{_sysconfdir}/pki/%{vdsm_name}/certs
%dir %{_sysconfdir}/pki/%{vdsm_name}/libvirt-spice
%config(noreplace) %{_sysconfdir}/pki/%{vdsm_name}/keys/libvirt_password
+%{_localstatedir}/lib/%{vdsm_name}/bonding-defaults.json
%dir %{_localstatedir}/lib/%{vdsm_name}
%dir %{_localstatedir}/lib/%{vdsm_name}/netconfback
%dir %{_localstatedir}/lib/%{vdsm_name}/persistence
@@ -1191,49 +1224,50 @@ exit 0
%defattr(-, root, root, -)
%{_mandir}/man1/vdsm-tool.1*
%{_bindir}/vdsm-tool
-%dir %{python_sitearch}/%{vdsm_name}
-%dir %{python_sitearch}/%{vdsm_name}/tool
-%{python_sitearch}/%{vdsm_name}/__init__.py*
-%{python_sitearch}/%{vdsm_name}/compat.py*
-%{python_sitearch}/%{vdsm_name}/config.py*
-%{python_sitearch}/%{vdsm_name}/constants.py*
-%{python_sitearch}/%{vdsm_name}/define.py*
-%{python_sitearch}/%{vdsm_name}/exception.py*
-%{python_sitearch}/%{vdsm_name}/ipwrapper.py*
-%{python_sitearch}/%{vdsm_name}/libvirtconnection.py*
-%{python_sitearch}/%{vdsm_name}/netinfo.py*
-%{python_sitearch}/%{vdsm_name}/netlink.py*
-%{python_sitearch}/%{vdsm_name}/profile.py*
-%{python_sitearch}/%{vdsm_name}/qemuimg.py*
-%{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py*
-%{python_sitearch}/%{vdsm_name}/netconfpersistence.py*
-%{python_sitearch}/%{vdsm_name}/sslutils.py*
-%{python_sitearch}/%{vdsm_name}/utils.py*
-%{python_sitearch}/%{vdsm_name}/vdscli.py*
-%{python_sitearch}/%{vdsm_name}/tool/__init__.py*
+%dir %{python_sitelib}/%{vdsm_name}
+%dir %{python_sitelib}/%{vdsm_name}/tool
+%{python_sitelib}/%{vdsm_name}/__init__.py*
+%{python_sitelib}/%{vdsm_name}/compat.py*
+%{python_sitelib}/%{vdsm_name}/config.py*
+%{python_sitelib}/%{vdsm_name}/constants.py*
+%{python_sitelib}/%{vdsm_name}/define.py*
+%{python_sitelib}/%{vdsm_name}/exception.py*
+%{python_sitelib}/%{vdsm_name}/ipwrapper.py*
+%{python_sitelib}/%{vdsm_name}/libvirtconnection.py*
+%{python_sitelib}/%{vdsm_name}/netinfo.py*
+%{python_sitelib}/%{vdsm_name}/netlink.py*
+%{python_sitelib}/%{vdsm_name}/profile.py*
+%{python_sitelib}/%{vdsm_name}/qemuimg.py*
+%{python_sitelib}/%{vdsm_name}/SecureXMLRPCServer.py*
+%{python_sitelib}/%{vdsm_name}/netconfpersistence.py*
+%{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/utils.py*
+%{python_sitelib}/%{vdsm_name}/vdscli.py*
+%{python_sitelib}/%{vdsm_name}/tool/__init__.py*
%if 0%{?with_systemd}
-%exclude %{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
+%exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
%else
-%{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
+%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
%endif
-%{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/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*
-%{python_sitearch}/%{vdsm_name}/tool/service.py*
-%{python_sitearch}/%{vdsm_name}/tool/transient.py*
-%{python_sitearch}/%{vdsm_name}/tool/unified_persistence.py*
-%{python_sitearch}/%{vdsm_name}/tool/upgrade.py*
-%{python_sitearch}/%{vdsm_name}/tool/upgrade_300_networks.py*
-%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py*
-%{python_sitearch}/%{vdsm_name}/tool/vdsm-id.py*
+%{python_sitelib}/%{vdsm_name}/tool/dummybr.py*
+%{python_sitelib}/%{vdsm_name}/tool/dump_bonding_defaults.py*
+%{python_sitelib}/%{vdsm_name}/tool/nwfilter.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurator.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/__init__*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/configfile.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/certificates.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/libvirt.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/sanlock.py*
+%{python_sitelib}/%{vdsm_name}/tool/configurators/sebool.py*
+%{python_sitelib}/%{vdsm_name}/tool/passwd.py*
+%{python_sitelib}/%{vdsm_name}/tool/restore_nets.py*
+%{python_sitelib}/%{vdsm_name}/tool/service.py*
+%{python_sitelib}/%{vdsm_name}/tool/transient.py*
+%{python_sitelib}/%{vdsm_name}/tool/unified_persistence.py*
+%{python_sitelib}/%{vdsm_name}/tool/upgrade.py*
+%{python_sitelib}/%{vdsm_name}/tool/upgrade_300_networks.py*
+%{python_sitelib}/%{vdsm_name}/tool/validate_ovirt_certs.py*
+%{python_sitelib}/%{vdsm_name}/tool/vdsm-id.py*
%files tests
%doc %{_datadir}/%{vdsm_name}/tests/README
@@ -1287,6 +1321,8 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotunplug/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_migrate_destination/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_migrate_destination/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py*
@@ -1534,6 +1570,12 @@ exit 0
%endif
%changelog
+* Thu Dec 25 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.10
+* vdsm tag 4.16.10 - ovirt 3.5 build
+
+* Wed Oct 8 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.16.7
+- vdsm tag 4.16.7
+
* Sun Sep 28 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.16.5-5
- vdsm tag 4.16.5-5
More information about the scm-commits
mailing list