[vdsm/f19] vdsm-4.14.8.1-0
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Thu May 15 00:06:49 UTC 2014
commit 59be833e9769dccc000bea42732231731bb71e62
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Wed May 14 20:06:21 2014 -0400
vdsm-4.14.8.1-0
sources | 2 +-
vdsm.spec | 292 ++++++++++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 214 insertions(+), 80 deletions(-)
---
diff --git a/sources b/sources
index ce065db..4d3d185 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-628bee48e4773dbc17b943283a08917f vdsm-4.13.4.tar.gz
+06930dfa60e27d3a418179b6edd40cd7 vdsm-4.14.8.1.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index a7fd0ab..561b408 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -6,9 +6,11 @@
# Required users and groups
%global vdsm_user vdsm
%global vdsm_group kvm
+%global qemu_user qemu
%global qemu_group qemu
%global snlk_group sanlock
%global snlk_user sanlock
+%global cdrom_group cdrom
# Upstream git release
# % global vdsm_release gf2f6683
@@ -35,6 +37,10 @@
%global with_gluster 1
%endif
+%if ! 0%{?rhel}
+%global with_vhostmd 1
+%endif
+
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%global with_systemd 1
%endif
@@ -45,7 +51,7 @@
%endif
Name: %{vdsm_name}
-Version: 4.13.4
+Version: 4.14.8.1
Release: 0%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
@@ -60,17 +66,25 @@ Url: http://www.ovirt.org/wiki/Vdsm
# ./autogen.sh --system
# make VERSION={version}-{vdsm_release} dist
Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gcc
BuildRequires: python
BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python-netaddr
+BuildRequires: rpm-build
# BuildRequires needed by the tests during the build
+BuildRequires: dosfstools
+BuildRequires: psmisc
BuildRequires: python-ethtool
+BuildRequires: python-inotify
BuildRequires: python-pthreading
BuildRequires: python-cpopen >= 1.3
+BuildRequires: rpm-python
+BuildRequires: libnl
BuildRequires: libselinux-python
BuildRequires: libvirt-python
BuildRequires: genisoimage
@@ -80,9 +94,9 @@ BuildRequires: m2crypto
BuildRequires: python-dmidecode
%endif
%if 0%{?rhel} == 6
+BuildRequires: python-argparse
BuildRequires: python-ordereddict
%endif
-BuildRequires: python-ethtool
# Autotools BuildRequires
%if 0%{?enable_autotools}
@@ -101,6 +115,7 @@ BuildRequires: python-pep8
BuildRequires: systemd-units
%endif
+Requires: ethtool
Requires: which
Requires: sudo >= 1.7.3
Requires: logrotate
@@ -113,10 +128,12 @@ Requires: python-inotify
Requires: python-argparse
Requires: python-cpopen >= 1.3
Requires: python-ethtool >= 0.6-3
+Requires: %{name}-python-zombiereaper = %{version}-%{release}
Requires: rpm-python
Requires: nfs-utils
Requires: m2crypto
Requires: libguestfs-tools-c
+Requires: libnl
Requires: %{name}-xmlrpc = %{version}-%{release}
Requires: mom >= 0.3.2-3
@@ -133,13 +150,26 @@ Requires: libvirt-daemon-driver-nwfilter
Requires: libvirt-daemon-driver-qemu
%else
%if 0%{?rhel}
-Requires: libvirt >= 0.10.2-18.el6_4.10
+Requires: libvirt >= 0.10.2-29.el6_5.4
%else
Requires: libvirt >= 1.0.2-1
%endif
%endif
Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
+# iscsi-intiator versions
+%if 0%{?rhel}
+%if 0%{?rhel} >= 7
+Requires: iscsi-initiator-utils
+%else
+Requires: iscsi-initiator-utils >= 6.2.0.872-15
+%endif # rhel 7
+%else # fedora
+Requires: iscsi-initiator-utils >= 6.2.0.873-3
+%endif
+
+Requires: sanlock >= 2.8, sanlock-python
+
%if 0%{?rhel}
Requires: python-ethtool >= 0.6-3
%if 0%{?rhel} >= 7
@@ -147,26 +177,22 @@ ExclusiveArch: x86_64
Requires: device-mapper-multipath
Requires: e2fsprogs
Requires: fence-agents-all
-Requires: iscsi-initiator-utils
Requires: lvm2
Requires: python
Requires: policycoreutils-python
Requires: python-pthreading >= 0.1.2
Requires: qemu-kvm
-Requires: qemu-kvm-img
-Requires: sanlock, sanlock-python
+Requires: qemu-img
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
-Requires: iscsi-initiator-utils >= 6.2.0.872-15
Requires: device-mapper-multipath >= 0.4.9-52
Requires: e2fsprogs >= 1.41.12-11
Requires: fence-agents
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: policycoreutils >= 2.0.83-19.30
Requires: policycoreutils-python >= 2.0.83-19.30
@@ -179,9 +205,11 @@ Requires: logrotate < 3.8.0
%if 0%{?fedora} >= 19
Requires: python-pthreading >= 0.1.2
Requires: fence-agents-all
+Requires: kernel >= 3.11.3-201
%else
Requires: python-pthreading
Requires: fence-agents
+Requires: kernel >= 3.6
%endif
# Subprocess and thread bug was found on python 2.7.2
Requires: python >= 2.7.3
@@ -191,11 +219,8 @@ Requires: python-ethtool >= 0.8-1
%if 0%{?fedora} >= 18
Requires: initscripts >= 9.42.2-1
%endif
-Requires: iscsi-initiator-utils >= 6.2.0.872-14
Requires: device-mapper-multipath >= 0.4.9-18
Requires: e2fsprogs >= 1.41.14
-Requires: kernel >= 3.6
-Requires: sanlock >= 2.4-2, sanlock-python
Requires: policycoreutils-python
Requires: sed >= 4.2.1-10
Requires: ed
@@ -217,7 +242,7 @@ Requires: systemd >= 197-1.fc18.2
# GlusterFS client-side RPMs needed for Gluster SD
%if 0%{?with_gluster}
-Requires: glusterfs >= 3.4.0
+Requires: glusterfs >= 3.4.2
Requires: glusterfs-cli
Requires: glusterfs-api
Requires: glusterfs-fuse
@@ -257,7 +282,6 @@ BuildArch: noarch
Requires: %{name}-python = %{version}-%{release}
Requires: %{name}-xmlrpc = %{version}-%{release}
-Requires: python-cpopen
%description cli
Call VDSM commands from the command line. Used for testing and debugging.
@@ -267,7 +291,6 @@ Summary: VDSM xmlrpc API
BuildArch: noarch
Requires: %{name}-python = %{version}-%{release}
-Requires: python-cpopen
%description xmlrpc
@@ -303,6 +326,15 @@ Requires: python >= 2.6
%description yajsonrpc
A JSON RPC server and client implementation.
+%package python-zombiereaper
+Summary: Collects zombie processes automatically
+BuildArch: noarch
+
+Requires: python >= 2.6
+
+%description python-zombiereaper
+Collects zombie processes automatically so you don't have to
+
%package bootstrap
Summary: VDSM bootstrapping package
BuildArch: noarch
@@ -325,13 +357,15 @@ Manager.
%package python
Summary: VDSM python libraries
+Requires: %{name}-python-zombiereaper = %{version}-%{release}
+Requires: python-cpopen >= 1.2.3-5
%description python
Shared libraries between the various VDSM packages.
%package debug-plugin
Summary: VDSM Debug Plugin
-Requires: vdsm
+Requires: %{name}
Requires: %{name}-xmlrpc = %{version}-%{release}
BuildArch: noarch
@@ -340,7 +374,7 @@ Used by the trained monkeys at Red Hat to insert chaos and mayhem in to VDSM.
%package tests
Summary: VDSM Test Suite
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: dracut
Requires: python-nose
BuildArch: noarch
@@ -351,12 +385,13 @@ A test suite for verifying the functionality of a running vdsm instance
%package hook-checkimages
Summary: Qcow2 disk image format check hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-checkimages
VDSM hook used to perform consistency check on a qcow2 format disk image
using the QEMU disk image utility.
+%if 0%{?with_vhostmd}
%package hook-vhostmd
Summary: VDSM hook set for interaction with vhostmd
Requires: vhostmd
@@ -364,11 +399,12 @@ BuildArch: noarch
%description hook-vhostmd
VDSM hook to use vhostmd per VM according to Virtualization Manager requests.
+%endif
%package hook-faqemu
Summary: Fake qemu process for VDSM quality assurance
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-faqemu
VDSM hook used for testing VDSM with multiple fake virtual machines without
@@ -393,6 +429,15 @@ VDSM hooks which allow to disable mac spoof filtering
either on all the of the VM's interfaces or on
specific vnics.
+%package hook-extnet
+Summary: Force a vNIC to connect to a specific libvirt network
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description hook-extnet
+VDSM hook which allows to connect a vNIC to a libvirt network that is managed
+outside of oVirt, such as an openvswitch network.
+
%package hook-fileinject
Summary: Allow uploading file to VMs disk
BuildArch: noarch
@@ -478,7 +523,7 @@ all network traffic.
%package hook-qemucmdline
Summary: QEMU cmdline hook for VDSM
BuildArch: noarch
-Requires: vdsm
+Requires: %{name}
%description hook-qemucmdline
Provides support for injecting QEMU cmdline via VDSM hook.
@@ -524,10 +569,21 @@ directly to a virtual machine.
%package hook-vmfex
Summary: vmfex support for VDSM
BuildArch: noarch
+Conflicts: hook-vmfex-dev
%description hook-vmfex
Hook for vmfex.
+%package hook-vmfex-dev
+Summary: VM-FEX vNIC support for VDSM
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+Conflicts: hook-vmfex
+
+%description hook-vmfex-dev
+Allows to use custom device properties to connect a guest vNIC to a host
+VM-FEX Virtual Function (SR-IOV with macvtap mode).
+
%package hook-vmdisk
Summary: External disk support for VDSM
BuildArch: noarch
@@ -593,8 +649,6 @@ install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}/lib/systemd/systemd-vds
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 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
install -Dm 0644 vdsm_reg/vdsm-reg.service \
@@ -607,8 +661,6 @@ 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 init/sysvinit/vdsm-restore-net-config.init \
- %{buildroot}%{_initrddir}/vdsm-restore-net-config
%endif
%if 0%{?with_tmpfiles_macro}
@@ -620,20 +672,16 @@ install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
# This is not commonplace, but we want /var/log/core to be a world-writable
# dropbox for core dumps
install -dDm 1777 %{buildroot}%{_localstatedir}/log/core
-%else
-# Install the configuration sample
-install -Dm 0644 lib/vdsm/vdsm.conf.sample \
- %{buildroot}%{_sysconfdir}/vdsm/vdsm.conf
+%endif
# Install the polkit for libvirt
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules
%else
install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.pkla
%endif
-%endif
%check
# Disabling the nose tests until they'll all succeed in koji.
@@ -651,9 +699,10 @@ export LC_ALL=C
/usr/sbin/useradd -r -u 36 -g %{vdsm_group} -d /var/lib/vdsm \
-s /sbin/nologin -c "Node Virtualization Manager" %{vdsm_user}
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user}
-/usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user}
+/usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
%post
+%{_bindir}/vdsm-tool configure --module sanlock --force
%{_bindir}/vdsm-tool sebool-config || :
# set the vdsm "secret" password for libvirt
%{_bindir}/vdsm-tool set-saslpasswd
@@ -680,24 +729,20 @@ fi
/sbin/restorecon -R /var/log/core >/dev/null 2>&1
# hack until we replace core dump with abrt
-%if 0%{?rhel}
+%if ! 0%{?with_systemd}
if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsmd
/sbin/chkconfig --add supervdsmd
- /sbin/chkconfig --add vdsm-restore-net-config
fi
%else
-%if 0%{?with_systemd}
/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 || :
/bin/systemctl enable supervdsmd.service >/dev/null 2>&1 || :
- /bin/systemctl enable vdsm-restore-net-config.service >/dev/null 2>&1 || :
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
exit 0
%endif
-%endif
%preun
if [ "$1" -eq 0 ]; then
@@ -718,14 +763,13 @@ if [ "$1" -eq 0 ]; then
/bin/sed -i -e 's/# VDSM backup//' %{_sysconfdir}/logrotate.d/libvirtd
fi
-%if 0%{?rhel}
+%if ! 0%{?with_systemd}
if [ "$1" -eq 0 ]
then
/sbin/service vdsmd stop > /dev/null 2>&1 || :
/sbin/chkconfig --del vdsmd
/sbin/service supervdsmd stop > /dev/null 2>&1 || :
/sbin/chkconfig --del supervdsmd
- /sbin/chkconfig --del vdsm-restore-net-config
/bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
/etc/sysctl.conf
@@ -746,12 +790,10 @@ fi
%if 0%{?with_systemd_macros}
%systemd_preun vdsmd.service
%systemd_preun supervdsmd.service
-%systemd_preun vdsm-restore-net-config.service
%else
if [ "$1" -eq 0 ]; then
/bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload disable supervdsmd.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable vdsm-restore-net-config.service > /dev/null 2>&1 || :
/bin/systemctl stop vdsmd.service > /dev/null 2>&1 || :
/bin/systemctl stop supervdsmd.service > /dev/null 2>&1 || :
fi
@@ -763,6 +805,9 @@ exit 0
if [ "$1" -ge 1 ]; then
supervdsmd_start_required='no'
vdsmd_start_required='no'
+
+ # Both vdsm and supervdsm should be managed here and must be restarted if
+ # ran before (code might changed)
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'
@@ -772,17 +817,19 @@ if [ "$1" -ge 1 ]; then
supervdsmd_start_required='yes'
fi
- if ! %{_bindir}/vdsm-tool libvirt-configure >/dev/null 2>&1; then
- # fallback to vdsmd reconfigure api. this is needed for ovirt-3.3 as
- # vdsm-tool api was modified from libvirt-configure to configure.
-
- # downgrade to older versions is not supported. for that please remove
- # vdsm packages and install the older version.
- for f in '/lib/systemd/systemd-vdsmd' '/etc/init.d/vdsmd'; do
- if [ -f "${f}" ]; then
- "${f}" reconfigure >/dev/null 2>&1 || :
- fi
- done
+ if ! %{_bindir}/vdsm-tool is-configured --module libvirt >/dev/null 2>&1;
+ then
+ if ! %{_bindir}/vdsm-tool configure --module libvirt --force \
+ >/dev/null 2>&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
+ if [ -f "${f}" ]; then
+ "${f}" reconfigure >/dev/null 2>&1 || :
+ fi
+ done
+ fi
fi
if [ "${supervdsmd_start_required}" = 'yes' ]; then
@@ -794,7 +841,10 @@ if [ "$1" -ge 1 ]; then
fi
exit 0
-%if 0%{?rhel}
+%if 0%{?rhel} == 6
+# In el6, We configure libvirt to use upstart without the libvirt.rpm's
+# awareness. Thus, we must stop/restart libvirt ourselves when the
+# libvirt.rpm is removed/upgraded.
%triggerun -- libvirt
if [ "$2" -eq "0" ]; then
/sbin/initctl stop libvirtd > /dev/null 2>&1 || :
@@ -807,7 +857,7 @@ fi
%endif
%post reg
-%if 0%{?rhel}
+%if ! 0%{?with_systemd}
if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add vdsm-reg
fi
@@ -824,7 +874,7 @@ exit 0
%endif
%preun reg
-%if 0%{?rhel}
+%if ! 0%{?with_systemd}
if [ "$1" -eq 0 ]
then
/sbin/service vdsm-reg stop > /dev/null 2>&1 || :
@@ -849,11 +899,9 @@ exit 0
/lib/systemd/systemd-vdsmd
%{_unitdir}/vdsmd.service
%{_unitdir}/supervdsmd.service
-%{_unitdir}/vdsm-restore-net-config.service
%else
%{_initrddir}/vdsmd
%{_initrddir}/supervdsmd
-%{_initrddir}/vdsm-restore-net-config
%endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center
@@ -867,6 +915,7 @@ exit 0
%dir %{_sysconfdir}/%{vdsm_name}
%dir %{_sysconfdir}/%{vdsm_name}/mom.d
%dir %{_datadir}/%{vdsm_name}
+%dir %{_datadir}/%{vdsm_name}/netconf
%dir %{_datadir}/%{vdsm_name}/storage
%dir %{_datadir}/%{vdsm_name}/storage/imageRepository
%{_datadir}/%{vdsm_name}/alignmentScan.py*
@@ -883,6 +932,7 @@ exit 0
%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
%{_datadir}/%{vdsm_name}/parted_utils.py*
%{_datadir}/%{vdsm_name}/mkimage.py*
+%{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
%{_datadir}/%{vdsm_name}/sourceRoute.py*
%{_datadir}/%{vdsm_name}/sourceRouteThread.py*
%{_datadir}/%{vdsm_name}/supervdsm.py*
@@ -893,9 +943,11 @@ exit 0
%{_datadir}/%{vdsm_name}/vdsm-restore-net-config
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
%{_datadir}/%{vdsm_name}/vm.py*
-%{_datadir}/%{vdsm_name}/zombieReaper.py*
+
+%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf
+%config(noreplace) %{_sysconfdir}/%{vdsm_name}/upgrade.logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.d/*.policy
%config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
@@ -940,6 +992,7 @@ exit 0
%{_datadir}/%{vdsm_name}/storage/iscsiadm.py*
%{_datadir}/%{vdsm_name}/storage/iscsi.py*
%{_datadir}/%{vdsm_name}/storage/localFsSD.py*
+%{_datadir}/%{vdsm_name}/storage/lvm.env
%{_datadir}/%{vdsm_name}/storage/lvm.py*
%{_datadir}/%{vdsm_name}/storage/misc.py*
%{_datadir}/%{vdsm_name}/storage/mount.py*
@@ -955,6 +1008,7 @@ exit 0
%{_datadir}/%{vdsm_name}/storage/sd.py*
%{_datadir}/%{vdsm_name}/storage/securable.py*
%{_datadir}/%{vdsm_name}/storage/sp.py*
+%{_datadir}/%{vdsm_name}/storage/spbackends.py*
%{_datadir}/%{vdsm_name}/storage/storageConstants.py*
%{_datadir}/%{vdsm_name}/storage/storage_exception.py*
%{_datadir}/%{vdsm_name}/storage/storage_mailbox.py*
@@ -970,6 +1024,7 @@ exit 0
%{_libexecdir}/%{vdsm_name}/safelease
%{_libexecdir}/%{vdsm_name}/spmprotect.sh
%{_libexecdir}/%{vdsm_name}/spmstop.sh
+%dir %{_libexecdir}/%{vdsm_name}/hooks
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_create
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_device_create
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_destroy
@@ -1013,6 +1068,8 @@ exit 0
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_network_setup
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_network_setup
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_set_num_of_cpus
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_set_num_of_cpus
%{_datadir}/%{vdsm_name}/addNetwork
%{_datadir}/%{vdsm_name}/configNetwork.py*
%{_datadir}/%{vdsm_name}/delNetwork
@@ -1022,6 +1079,7 @@ exit 0
%{_datadir}/%{vdsm_name}/ksm.py*
%{_datadir}/%{vdsm_name}/momIF.py*
%{_datadir}/%{vdsm_name}/netconf/__init__.py*
+%{_datadir}/%{vdsm_name}/netconf/dhclient.py*
%{_datadir}/%{vdsm_name}/netconf/ifcfg.py*
%{_datadir}/%{vdsm_name}/netconf/libvirtCfg.py*
%{_datadir}/%{vdsm_name}/netconf/iproute2.py*
@@ -1045,13 +1103,12 @@ exit 0
%{_mandir}/man8/vdsmd.8*
%if 0%{?rhel}
%dir %{_localstatedir}/log/core
-%else
-%if 0%{?fedora} >= 18
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%{_polkitdir}/10-vdsm-libvirt-access.rules
%else
%{_polkitdir}/10-vdsm-libvirt-access.pkla
%endif
-%endif
%defattr(-, %{vdsm_user}, %{qemu_group}, -)
%dir %{_localstatedir}/lib/libvirt/qemu/channels
@@ -1064,10 +1121,11 @@ exit 0
%config(noreplace) %{_sysconfdir}/pki/%{vdsm_name}/keys/libvirt_password
%dir %{_localstatedir}/lib/%{vdsm_name}
%dir %{_localstatedir}/lib/%{vdsm_name}/netconfback
+%dir %{_localstatedir}/lib/%{vdsm_name}/persistence
+%dir %{_localstatedir}/lib/%{vdsm_name}/upgrade
%dir %{_localstatedir}/run/%{vdsm_name}
%dir %{_localstatedir}/run/%{vdsm_name}/sourceRoutes
%dir %{_localstatedir}/run/%{vdsm_name}/trackedInterfaces
-%ghost %dir %{_localstatedir}/run/%{vdsm_name}/pools
%ghost %dir %{_localstatedir}/run/%{vdsm_name}/payload
%dir %{_localstatedir}/log/%{vdsm_name}
%dir %{_localstatedir}/log/%{vdsm_name}/backup
@@ -1075,9 +1133,8 @@ exit 0
%files python
%defattr(-, root, root, -)
%{_bindir}/vdsm-tool
-%if !0%{?rhel}
-%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
-%endif
+%dir %{python_sitearch}/%{vdsm_name}
+%dir %{python_sitearch}/%{vdsm_name}/tool
%{python_sitearch}/%{vdsm_name}/__init__.py*
%{python_sitearch}/%{vdsm_name}/config.py*
%{python_sitearch}/%{vdsm_name}/constants.py*
@@ -1086,8 +1143,10 @@ exit 0
%{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}/qemuImg.py*
%{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py*
+%{python_sitearch}/%{vdsm_name}/netconfpersistence.py*
%{python_sitearch}/%{vdsm_name}/utils.py*
%{python_sitearch}/%{vdsm_name}/vdscli.py*
%{python_sitearch}/%{vdsm_name}/tool/__init__.py*
@@ -1098,25 +1157,34 @@ exit 0
%endif
%{python_sitearch}/%{vdsm_name}/tool/dummybr.py*
%{python_sitearch}/%{vdsm_name}/tool/nwfilter.py*
-%{python_sitearch}/%{vdsm_name}/tool/libvirt_configure.py*
+%{python_sitearch}/%{vdsm_name}/tool/configurator.py*
%{_libexecdir}/%{vdsm_name}/libvirt_configure.sh
%{python_sitearch}/%{vdsm_name}/tool/passwd.py*
-%{python_sitearch}/%{vdsm_name}/tool/sanlock.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*
%files tests
%doc %{_datadir}/%{vdsm_name}/tests/README
%defattr(-, root, root, -)
+%dir %{_datadir}/%{vdsm_name}/tests
+%dir %{_datadir}/%{vdsm_name}/tests/functional
%{_datadir}/%{vdsm_name}/tests/*.py*
%{_datadir}/%{vdsm_name}/tests/cpu_info.out
%{_datadir}/%{vdsm_name}/tests/caps_libvirt_intel_E5649.out
%{_datadir}/%{vdsm_name}/tests/caps_libvirt_amd_6274.out
%{_datadir}/%{vdsm_name}/tests/caps_libvirt_intel_E31220.out
+%{_datadir}/%{vdsm_name}/tests/caps_lscpu_ppc64_1_4_4.out
+%{_datadir}/%{vdsm_name}/tests/caps_lscpu_ppc64_2_4_8.out
%{_datadir}/%{vdsm_name}/tests/glob_1c60971a-8647-44ac-ae33-6520887f8843.out
%{_datadir}/%{vdsm_name}/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
+%{_datadir}/%{vdsm_name}/tests/mem_info.out
%{_datadir}/%{vdsm_name}/tests/netmaskconversions
%{_datadir}/%{vdsm_name}/tests/run_tests.sh
%{_datadir}/%{vdsm_name}/tests/tc_filter_show.out
@@ -1124,6 +1192,7 @@ exit 0
%{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
%{_datadir}/%{vdsm_name}/tests/glusterVolumeRebalanceStatus.xml
%{_datadir}/%{vdsm_name}/tests/glusterVolumeRemoveBricksStatus.xml
+%{_datadir}/%{vdsm_name}/tests/glusterVolumeTasks.xml
%{_datadir}/%{vdsm_name}/tests/functional/*.py*
%{_datadir}/%{vdsm_name}/tests/functional/*.policy
@@ -1131,16 +1200,21 @@ exit 0
%defattr(-, root, root, -)
%{_sysconfdir}/sudoers.d/50_vdsm_hook_openstacknet
%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_create/openstacknet_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_destroy/50_openstacknet
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_destroy/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_device_migrate_destination/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug/openstacknet_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotunplug/50_openstacknet
+%{_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_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/openstacknet_utils.py*
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_openstacknet
-%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_consts.py*
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/openstacknet_utils.py*
+%if 0%{?with_vhostmd}
%files hook-vhostmd
%defattr(-, root, root, -)
%doc COPYING
@@ -1149,6 +1223,13 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vhostmd
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_dehibernate/50_vhostmd
%{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_vhostmd
+%else
+%exclude %{_sysconfdir}/sudoers.d/50_vdsm_hook_vhostmd
+%exclude %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vhostmd
+%exclude %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vhostmd
+%exclude %{_libexecdir}/%{vdsm_name}/hooks/before_vm_dehibernate/50_vhostmd
+%exclude %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_vhostmd
+%endif
%files hook-qemucmdline
%defattr(-, root, root, -)
@@ -1201,6 +1282,11 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_macspoof
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_macspoof
+%files hook-extnet
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_extnet
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_extnet
+
%files hook-nestedvt
%defattr(-, root, root, -)
%{_sysconfdir}/modprobe.d/vdsm-nestedvt.conf
@@ -1249,6 +1335,12 @@ exit 0
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vmfex
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmfex
+
+%files hook-vmfex-dev
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_vmfex
+%{_libexecdir}/%{vdsm_name}/hooks/before_device_migrate_destination/50_vmfex
+%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_vmfex
%endif
%files debug-plugin
@@ -1267,6 +1359,7 @@ exit 0
%files xmlrpc
%defattr(-, root, root, -)
+%dir %{_datadir}/%{vdsm_name}
%{_datadir}/%{vdsm_name}/BindingXMLRPC.py*
%files api
@@ -1279,11 +1372,15 @@ exit 0
%{_datadir}/%{vdsm_name}/Bridge.py*
%files yajsonrpc
+%dir %{python_sitelib}/yajsonrpc
%{python_sitelib}/yajsonrpc/__init__.py*
%{python_sitelib}/yajsonrpc/asyncoreReactor.py*
%{python_sitelib}/yajsonrpc/protonReactor.py*
%{python_sitelib}/yajsonrpc/client.py*
+%files python-zombiereaper
+%{python_sitelib}/zombiereaper/__init__.py*
+
%files bootstrap
%defattr(-, root, root, -)
%doc COPYING
@@ -1337,17 +1434,54 @@ exit 0
%{_datadir}/%{vdsm_name}/gluster/vdsmapi-gluster-schema.json
%{_datadir}/%{vdsm_name}/gluster/hooks.py*
%{_datadir}/%{vdsm_name}/gluster/services.py*
+%{_datadir}/%{vdsm_name}/gluster/tasks.py*
%endif
%changelog
-* Wed Apr 02 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.4
-- vdsm-4.13.4 for ovirt-3.3.5
-
-* Mon Feb 03 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.3-3
-- spec: replace requires vdsm-python-cpopen
-
-* Thu Jan 23 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.3-2
-- Report conflict when python-cpopen is installed
+* Wed May 07 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.8.1-0
+- vdsm tag 4.14.8.1
+
+* Thu Apr 24 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.7-0
+- vdsm tag 4.14.7-0
+
+* Tue Mar 25 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.6-0
+- vdsm tag 4.14.6-0
+
+* Sun Mar 09 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.14.5-0
+- Adding patches until 4.14.5 tag
+- Urgent fix for 4.14.4 that included http-1.1 support for python 2.6 -
+xmlrpc: [Fix] Use correct base class for parsing request
+
+* Mon Feb 10 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.2-0
+- vdsm 4.14.2-0
+
+* Thu Feb 06 2014 Yaniv Bronhaim <ybronhei at redhat.com - 4.14.1-4
+- Adding configure sanlock on force
+
+* Wed Feb 05 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-3
+- execCmd with sudo=root raise require tty fault when running as root
+- sysvinit: Ensure that iscsid is started (BZ#1056948)
+- Add missing libnl buildrequires dependency
+- vdsm.spec: vdsm-python requires python-cpopen
+- netconfig: set ETHTOOL_OPTS when a NIC goes up (BZ#1059680)
+- sos: plugin should ignore /var/run/vdsm/storage
+- vdsm.spec: vdsm should own vdsm.log (BZ#1055153)
+- vdsm.spec: own metadata supervdsm mom logs (BZ#1055153)
+- spec: do not remove vdsm logs when pkg removed (BZ#1055153)
+- gluster: add host uuid in volume status
+- gluster: interpret and use correct xml elements
+- gluster: adopt xml changes of rebalance and remove-brick status
+- vm: do not pause during refreshVolume (BZ#889097)
+- spec: vdsm pkg for EL distro must include pkla (BZ#1060524)
+
+* Tue Jan 21 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-2
+- vdsm.spec: Add BuildRequires to python-argparse
+
+* Mon Jan 20 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-1
+- Rebuild 4.14.1 from ovirt-3.4
+
+* Mon Jan 20 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-0
+- Build 4.14.1-0
* Mon Jan 13 2014 Yaniv Bronhaim <ybronhei at redhat.com> - 4.13.3-1
- Reverting iscsi changes that caused a regression by importing
More information about the scm-commits
mailing list