Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
8adf02e5be | ||
|
|
5debaf8f45 | ||
|
|
26eb52d189 | ||
|
|
058bd80c0c | ||
|
|
6eed8fd705 | ||
|
|
34d58ae3a8 | ||
|
|
eef88bc323 |
2 changed files with 116 additions and 178 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
f77cbb5bfdbf0603fc0892ed8e0ae8e9 vdsm-4.17.0.tar.gz
|
||||
fc1ede5da30289379cd3401d7e113e4e vdsm-4.16.20.tar.gz
|
||||
|
|
|
|||
292
vdsm.spec
292
vdsm.spec
|
|
@ -12,20 +12,12 @@
|
|||
%global snlk_user sanlock
|
||||
%global cdrom_group cdrom
|
||||
|
||||
# koji build - overridable using rpmbuild --define "koji_build 1"
|
||||
%{!?koji_build: %global fedora_koji_build 0}
|
||||
# Fedora official build
|
||||
%global fedora_koji_build 1
|
||||
|
||||
# RHEV build - overridable using rpmbuild --define "rhev_build 1"
|
||||
%{!?rhev_build: %global rhev_build 0}
|
||||
|
||||
%if 0%{fedora_koji_build}
|
||||
%global with_hooks 1
|
||||
%endif
|
||||
|
||||
%if %{rhev_build}
|
||||
%global rhev_build_config_opt --enable-rhev
|
||||
%endif
|
||||
|
||||
# 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.
|
||||
|
|
@ -33,31 +25,33 @@
|
|||
|
||||
# Skips check since rhel default repos lack pep8 and pyflakes
|
||||
%if ! 0%{?rhel}
|
||||
%{!?with_check:%global with_check 1}
|
||||
%else
|
||||
%{!?with_check:%global with_check 0}
|
||||
%global with_check 1
|
||||
%endif
|
||||
|
||||
# Required paths
|
||||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} >= 18
|
||||
%global _polkitdir %{_datadir}/polkit-1/rules.d
|
||||
%else
|
||||
%global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
|
||||
%endif
|
||||
|
||||
# Gluster should not be shipped with RHEV
|
||||
%if ! 0%{?rhev_build}
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || ! %{fedora_koji_build}
|
||||
%global with_gluster 1
|
||||
%endif
|
||||
|
||||
%if ! 0%{?rhel} || ! 0%{fedora_koji_build}
|
||||
%if ! 0%{?rhel}
|
||||
%global with_vhostmd 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
|
||||
%global with_systemd 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%global with_systemd_macros 1
|
||||
%global with_tmpfiles_macro 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%global with_chown_hack 1
|
||||
%endif
|
||||
|
|
@ -71,8 +65,8 @@
|
|||
%endif
|
||||
|
||||
Name: %{vdsm_name}
|
||||
Version: 4.17.0
|
||||
Release: 0.1.git8f8b927%{?dist}%{?extra_release}
|
||||
Version: 4.16.20
|
||||
Release: 2%{?dist}%{?extra_release}
|
||||
Summary: Virtual Desktop Server Manager
|
||||
|
||||
Group: Applications/System
|
||||
|
|
@ -90,35 +84,36 @@ ExclusiveArch: x86_64 ppc64
|
|||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
|
||||
BuildRequires: cyrus-sasl-lib
|
||||
BuildRequires: gcc
|
||||
BuildRequires: python
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-netaddr
|
||||
BuildRequires: python-nose
|
||||
BuildRequires: python-netaddr
|
||||
BuildRequires: rpm-build
|
||||
BuildRequires: cyrus-sasl-lib
|
||||
|
||||
# BuildRequires needed by the tests during the build
|
||||
BuildRequires: dosfstools
|
||||
BuildRequires: genisoimage
|
||||
BuildRequires: libnl3
|
||||
BuildRequires: libselinux-python
|
||||
BuildRequires: libvirt-python
|
||||
BuildRequires: m2crypto
|
||||
BuildRequires: openssl
|
||||
BuildRequires: policycoreutils-python
|
||||
BuildRequires: mom
|
||||
BuildRequires: psmisc
|
||||
BuildRequires: python-cpopen >= 1.3
|
||||
BuildRequires: python-ethtool
|
||||
BuildRequires: python-inotify
|
||||
BuildRequires: python-ioprocess >= 0.14
|
||||
BuildRequires: python-pthreading
|
||||
BuildRequires: python-cpopen >= 1.3
|
||||
BuildRequires: qemu-img
|
||||
BuildRequires: rpm-python
|
||||
BuildRequires: libnl3
|
||||
BuildRequires: libselinux-python
|
||||
BuildRequires: libvirt-python
|
||||
BuildRequires: genisoimage
|
||||
BuildRequires: openssl
|
||||
BuildRequires: policycoreutils-python
|
||||
BuildRequires: m2crypto
|
||||
%if 0%{?rhel} == 6
|
||||
BuildRequires: python-simplejson >= 2.0.9
|
||||
BuildRequires: policycoreutils-python > 2.0.83-19.47
|
||||
BuildRequires: python-argparse
|
||||
BuildRequires: python-ordereddict
|
||||
BuildRequires: python-simplejson >= 2.0.9
|
||||
%endif
|
||||
|
||||
# Autotools BuildRequires
|
||||
|
|
@ -151,10 +146,12 @@ Requires: python-argparse
|
|||
Requires: python-cpopen >= 1.3
|
||||
Requires: python-ioprocess >= 0.14
|
||||
Requires: python-pthreading >= 0.1.3-3
|
||||
Requires: %{name}-infra = %{version}-%{release}
|
||||
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: libnl3
|
||||
Requires: %{name}-xmlrpc = %{version}-%{release}
|
||||
Requires: %{name}-jsonrpc = %{version}-%{release}
|
||||
|
|
@ -175,26 +172,39 @@ Requires: python-dmidecode
|
|||
Requires: dmidecode
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
Requires: libguestfs-tools-c >= 1:1.20.11-10
|
||||
%else # fedora
|
||||
Requires: libguestfs-tools-c >= 1:1.26.7-2
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
Requires: libvirt-daemon >= 1.1.1
|
||||
Requires: libvirt-daemon-config-nwfilter
|
||||
Requires: libvirt-daemon-driver-network
|
||||
Requires: libvirt-daemon-driver-nwfilter
|
||||
Requires: libvirt-daemon-driver-qemu
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7
|
||||
%if 0%{?rhev_build}
|
||||
Requires: libvirt-daemon >= 1.2.8-16.el7_1.2
|
||||
Requires: libvirt-python >= 1.2.8-7.el7_1.1
|
||||
%else
|
||||
%if 0%{?rhel}
|
||||
Requires: libvirt-daemon >= 1.2.8-15.el7
|
||||
Requires: libvirt-python
|
||||
%endif # rhev_build
|
||||
%endif # rhel 7
|
||||
|
||||
%if 0%{?rhel} == 6
|
||||
Requires: libvirt >= 0.10.2-29.el6_5.4
|
||||
%else
|
||||
Requires: libvirt >= 1.1.1
|
||||
Requires: libvirt-python
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 22
|
||||
Requires: libvirt-daemon >= 1.2.13
|
||||
Requires: libvirt-python
|
||||
%endif
|
||||
Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 21
|
||||
Requires: libvirt-daemon >= 1.2.9
|
||||
Requires: libvirt-python
|
||||
%endif
|
||||
|
||||
Requires: libvirt-lock-sanlock, libvirt-client
|
||||
|
||||
# iscsi-intiator versions
|
||||
%if 0%{?rhel}
|
||||
|
|
@ -210,6 +220,7 @@ Requires: iscsi-initiator-utils >= 6.2.0.873-21
|
|||
Requires: sanlock >= 2.8, sanlock-python
|
||||
|
||||
%if 0%{?rhel}
|
||||
Requires: python-ethtool >= 0.6-3
|
||||
%if 0%{?rhel} >= 7
|
||||
Requires: device-mapper-multipath
|
||||
Requires: e2fsprogs
|
||||
|
|
@ -217,17 +228,17 @@ Requires: fence-agents-all
|
|||
Requires: lvm2
|
||||
Requires: python
|
||||
Requires: policycoreutils-python
|
||||
Requires: selinux-policy-targeted >= 3.12.1-153.el7_0.13
|
||||
Requires: selinux-policy-targeted >= selinux-policy-3.13.1-16.el7
|
||||
%else
|
||||
Requires: python
|
||||
Requires: device-mapper-multipath >= 0.4.9-52
|
||||
Requires: e2fsprogs >= 1.41.12-11
|
||||
Requires: fence-agents
|
||||
Requires: kernel >= 2.6.32-465
|
||||
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.47.el6_6.1
|
||||
Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.1
|
||||
Requires: selinux-policy-targeted >= 3.7.19-260.el6_6.2
|
||||
Requires: lvm2 >= 2.02.100-5
|
||||
Requires: logrotate < 3.8.0
|
||||
%endif
|
||||
|
|
@ -236,6 +247,7 @@ Requires: fence-agents-all
|
|||
Requires: kernel >= 3.11.3-201
|
||||
# Subprocess and thread bug was found on python 2.7.2
|
||||
Requires: python >= 2.7.3
|
||||
Requires: python-ethtool >= 0.8-1
|
||||
Requires: initscripts >= 9.42.2-1
|
||||
Requires: device-mapper-multipath >= 0.4.9-18
|
||||
Requires: e2fsprogs >= 1.41.14
|
||||
|
|
@ -243,7 +255,7 @@ Requires: policycoreutils-python
|
|||
Requires: sed >= 4.2.1-10
|
||||
Requires: ed
|
||||
Requires: lvm2 >= 2.02.98-15
|
||||
Requires: selinux-policy-targeted >= 3.12.1-71
|
||||
Requires: selinux-policy-targeted >= 3.12.1-177
|
||||
# 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.
|
||||
Requires: policycoreutils >= 2.1.13-55
|
||||
|
|
@ -251,17 +263,21 @@ Requires: systemd >= 197-1.fc18.2
|
|||
%endif
|
||||
|
||||
%if !%{fedora_koji_build}
|
||||
%global rhev_suffix -rhev
|
||||
%endif
|
||||
%if 0%{?rhev_build} || 0%{?rhel} < 7
|
||||
%global qemu_suffix -rhev
|
||||
%else
|
||||
%global qemu_suffix -ev
|
||||
%endif # rhev_build
|
||||
%endif # !%{fedora_koji_build}
|
||||
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} >= 7
|
||||
Requires: qemu-kvm%{?rhev_suffix}
|
||||
Requires: qemu-img%{?rhev_suffix}
|
||||
Requires: qemu-kvm%{?qemu_suffix} >= 10:2.1.2-23.el7_1.2
|
||||
Requires: qemu-img%{?qemu_suffix} >= 10:2.1.2-23.el7_1.2
|
||||
%else
|
||||
Requires: qemu-kvm%{?rhev_suffix} >= 2:0.12.1.2-2.415.el6_5.3
|
||||
Requires: qemu-img%{?rhev_suffix} >= 2:0.12.1.2-2.415.el6_5.3
|
||||
%endif
|
||||
Requires: qemu-kvm%{?qemu_suffix} >= 2:0.12.1.2-2.422
|
||||
Requires: qemu-img%{?qemu_suffix} >= 2:0.12.1.2-2.422
|
||||
%endif # rhel > = 7
|
||||
%else
|
||||
Requires: qemu-kvm >= 2:0.15.0-4
|
||||
Requires: qemu-img >= 2:0.15.0-4
|
||||
|
|
@ -288,19 +304,14 @@ Requires: pyparted
|
|||
|
||||
Requires(post): /usr/sbin/saslpasswd2
|
||||
|
||||
%if 0%{?fedora} >= 21
|
||||
%if 0%{?fedora} && 0%{?fedora} >= 21
|
||||
Requires(post): hostname
|
||||
%else
|
||||
Requires(post): /bin/hostname
|
||||
%endif
|
||||
|
||||
%if 0%{?rhev_build}
|
||||
# backward compatible with older bootstrap code
|
||||
# see bug#870079
|
||||
# can be removed when rhevm-3.0 hosts are
|
||||
# updated with latest vdsm-bootstrap
|
||||
Requires: %{name}-cli = %{version}-%{release}
|
||||
%endif
|
||||
Requires(post): policycoreutils-python
|
||||
Requires(preun): policycoreutils-python
|
||||
|
||||
%description
|
||||
The VDSM service is required by a Virtualization Manager to manage the
|
||||
|
|
@ -353,24 +364,18 @@ Requires: python >= 2.6
|
|||
%description yajsonrpc
|
||||
A JSON RPC server and client implementation.
|
||||
|
||||
%package infra
|
||||
Summary: Utilities and libraries for vdsm
|
||||
%package python-zombiereaper
|
||||
Summary: Collects zombie processes automatically
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: python >= 2.6
|
||||
Obsoletes: python-zombiereaper
|
||||
|
||||
%description infra
|
||||
Utilities and libraries for vdsm.
|
||||
%description python-zombiereaper
|
||||
Collects zombie processes automatically so you don't have to
|
||||
|
||||
%package bootstrap
|
||||
Summary: VDSM bootstrapping package
|
||||
BuildArch: noarch
|
||||
%if 0%{?rhel} < 7
|
||||
Requires: python-ethtool >= 0.6-3
|
||||
%else
|
||||
Requires: python-ethtool >= 0.8-1
|
||||
%endif
|
||||
|
||||
%description bootstrap
|
||||
VDSM bootstrapping package. Used for delivering the bootstrap code onto the
|
||||
|
|
@ -391,7 +396,7 @@ Manager.
|
|||
|
||||
%package python
|
||||
Summary: VDSM python libraries
|
||||
Requires: %{name}-infra = %{version}-%{release}
|
||||
Requires: %{name}-python-zombiereaper = %{version}-%{release}
|
||||
Requires: python-cpopen >= 1.2.3-5
|
||||
Requires: m2crypto
|
||||
Requires: python-ioprocess >= 0.14
|
||||
|
|
@ -419,14 +424,6 @@ BuildArch: noarch
|
|||
%description tests
|
||||
A test suite for verifying the functionality of a running vdsm instance
|
||||
|
||||
%package hook-allocate_net
|
||||
Summary: random_network allocation hook for VDSM
|
||||
BuildArch: noarch
|
||||
Requires: %{name}
|
||||
|
||||
%description hook-allocate_net
|
||||
VDSM hook used to allocate networks for vms in a random fashion
|
||||
|
||||
%package hook-checkimages
|
||||
Summary: Qcow2 disk image format check hook for VDSM
|
||||
BuildArch: noarch
|
||||
|
|
@ -491,14 +488,6 @@ VDSM hooks which allow to disable mac spoof filtering
|
|||
either on all the of the VM's interfaces or on
|
||||
specific vnics.
|
||||
|
||||
%package hook-noipspoof
|
||||
Summary: Enables strict anti-spoofing filtering
|
||||
BuildArch: noarch
|
||||
|
||||
%description hook-noipspoof
|
||||
VDSM hook which allows to enable strict anti-spoofing filtering
|
||||
on all of the the VM's interfaces.
|
||||
|
||||
%package hook-extnet
|
||||
Summary: Force a vNIC to connect to a specific libvirt network
|
||||
BuildArch: noarch
|
||||
|
|
@ -635,7 +624,7 @@ such as: vendor, version, date and release
|
|||
|
||||
%package hook-sriov
|
||||
Summary: sr-iov support for VDSM
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} >= 18
|
||||
Requires: libvirt-daemon-driver-nodedev
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
|
@ -678,15 +667,6 @@ BuildArch: noarch
|
|||
%description hook-vmdisk
|
||||
Hook adds additional disk image for a VM (raw or qcow2)
|
||||
|
||||
%package hook-ipv6
|
||||
Summary: Set IPv6 configuration through custom network properties
|
||||
BuildArch: noarch
|
||||
Requires: %{name} >= 4.16.7
|
||||
|
||||
%description hook-ipv6
|
||||
VDSM hook used for applying IPv6 configuration through custom network
|
||||
properties
|
||||
|
||||
%if 0%{?with_gluster}
|
||||
%package gluster
|
||||
Summary: Gluster Plugin for VDSM
|
||||
|
|
@ -710,19 +690,7 @@ sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
|
|||
%if 0%{?enable_autotools}
|
||||
autoreconf -if
|
||||
%endif
|
||||
%configure %{?with_hooks:--enable-hooks} \
|
||||
%{?with_chown_hack:--enable-chown-hack} \
|
||||
%{rhev_build_config_opt} \
|
||||
%if 0%{?rhev_build}
|
||||
--with-reg-bridge-name='rhevm' \
|
||||
--with-engine-name='RHEV-M' \
|
||||
--with-smbios-manufacturer='Red Hat' \
|
||||
--with-smbios-osname='RHEV Hypervisor' \
|
||||
--with-qemu-kvm='qemu-kvm-rhev' \
|
||||
--with-qemu-img='qemu-img-rhev' \
|
||||
--with-register-uri='/RHEVManagerWeb/VdsAutoRegistration.aspx'
|
||||
%endif
|
||||
|
||||
%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/'`
|
||||
|
|
@ -755,6 +723,7 @@ install -Dm 0644 vdsm/limits.conf \
|
|||
%if 0%{?with_systemd}
|
||||
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/vdsm-network.service %{buildroot}%{_unitdir}/vdsm-network.service
|
||||
install -Dm 0644 init/systemd/supervdsmd.service %{buildroot}%{_unitdir}/supervdsmd.service
|
||||
|
||||
install -Dm 0755 vdsm_reg/vdsm-reg.init \
|
||||
|
|
@ -771,7 +740,7 @@ install -Dm 0755 init/sysvinit/supervdsmd.init %{buildroot}%{_initrddir}/supervd
|
|||
install -Dm 0755 vdsm_reg/vdsm-reg.init %{buildroot}%{_initrddir}/vdsm-reg
|
||||
%endif
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?with_tmpfiles_macro}
|
||||
install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
|
||||
%{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
|
||||
%endif
|
||||
|
|
@ -783,7 +752,7 @@ install -dDm 1777 %{buildroot}%{_localstatedir}/log/core
|
|||
%endif
|
||||
|
||||
# Install the polkit for libvirt
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
|
||||
%{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules
|
||||
%else
|
||||
|
|
@ -799,7 +768,7 @@ install -Dm 0755 vdsm/virt/libvirt-hook.sh \
|
|||
|
||||
%check
|
||||
%if 0%{?with_check}
|
||||
#make check
|
||||
make check
|
||||
%endif
|
||||
|
||||
%clean
|
||||
|
|
@ -857,9 +826,18 @@ 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 || :
|
||||
/bin/systemctl enable vdsm-network.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable supervdsmd.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
|
|
@ -893,14 +871,16 @@ then
|
|||
fi
|
||||
fi
|
||||
%else
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?with_systemd_macros}
|
||||
%systemd_preun vdsmd.service
|
||||
%systemd_preun vdsmd-network.service
|
||||
%systemd_preun supervdsmd.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 stop vdsmd.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop vdsm-network.service > /dev/null 2>&1 || :
|
||||
/bin/systemctl stop supervdsmd.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
exit 0
|
||||
|
|
@ -968,7 +948,7 @@ if [ "$1" -eq 1 ] ; then
|
|||
/sbin/chkconfig --add vdsm-reg
|
||||
fi
|
||||
%else
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?with_systemd_macros}
|
||||
%systemd_post vdsm-reg.service
|
||||
%else
|
||||
if [ "$1" -eq 1 ] ; then
|
||||
|
|
@ -987,7 +967,7 @@ then
|
|||
/sbin/chkconfig --del vdsm-reg
|
||||
fi
|
||||
%else
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?with_systemd_macros}
|
||||
%systemd_preun vdsm-reg.service
|
||||
%else
|
||||
if [ "$1" -eq 0 ]; then
|
||||
|
|
@ -1004,6 +984,7 @@ exit 0
|
|||
%if 0%{?with_systemd}
|
||||
/usr/lib/systemd/systemd-vdsmd
|
||||
%{_unitdir}/vdsmd.service
|
||||
%{_unitdir}/vdsm-network.service
|
||||
%{_unitdir}/supervdsmd.service
|
||||
%else
|
||||
%{_initrddir}/vdsmd
|
||||
|
|
@ -1023,7 +1004,6 @@ exit 0
|
|||
%dir %{_datadir}/%{vdsm_name}
|
||||
%dir %{_datadir}/%{vdsm_name}/network
|
||||
%dir %{_datadir}/%{vdsm_name}/network/configurators
|
||||
%dir %{_datadir}/%{vdsm_name}/network/tc
|
||||
%dir %{_datadir}/%{vdsm_name}/storage
|
||||
%dir %{_datadir}/%{vdsm_name}/storage/imageRepository
|
||||
%dir %{_datadir}/%{vdsm_name}/virt
|
||||
|
|
@ -1036,7 +1016,8 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/API.py*
|
||||
%{_datadir}/%{vdsm_name}/hooking.py*
|
||||
%{_datadir}/%{vdsm_name}/hooks.py*
|
||||
%{_datadir}/%{vdsm_name}/hostdev.py*
|
||||
%{_datadir}/%{vdsm_name}/lsblk.py*
|
||||
%{_datadir}/%{vdsm_name}/md_utils.py*
|
||||
%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
|
||||
%{_datadir}/%{vdsm_name}/parted_utils.py*
|
||||
%{_datadir}/%{vdsm_name}/mkimage.py*
|
||||
|
|
@ -1045,28 +1026,20 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/protocoldetector.py*
|
||||
%{_datadir}/%{vdsm_name}/supervdsm.py*
|
||||
%{_datadir}/%{vdsm_name}/supervdsmServer
|
||||
%{_datadir}/%{vdsm_name}/v2v.py*
|
||||
%{_datadir}/%{vdsm_name}/vdsm
|
||||
%{_datadir}/%{vdsm_name}/vdsm-restore-net-config
|
||||
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
|
||||
%{_datadir}/%{vdsm_name}/virt/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/domain_descriptor.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/guestagent.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/migration.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/sampling.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/vmxml.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/sampling.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/utils.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/vmdevices/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/vmdevices/core.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/vmdevices/hwclass.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/vmdevices/network.py*
|
||||
%{_datadir}/%{vdsm_name}/virt/vmdevices/storage.py*
|
||||
%{_datadir}/%{vdsm_name}/tool
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
|
||||
|
|
@ -1080,7 +1053,7 @@ exit 0
|
|||
%if 0%{?with_systemd}
|
||||
%config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf
|
||||
%endif
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?with_tmpfiles_macro}
|
||||
%config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf
|
||||
%endif
|
||||
%{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh
|
||||
|
|
@ -1105,19 +1078,12 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/network/models.py*
|
||||
%{_datadir}/%{vdsm_name}/network/sourceroute.py*
|
||||
%{_datadir}/%{vdsm_name}/network/sourceroutethread.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/dhclient.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/ifcfg.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/libvirt.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/iproute2.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/pyroute_two.py*
|
||||
%{_datadir}/%{vdsm_name}/network/configurators/qos.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/_parser.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/_wrapper.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/cls.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/filter.py*
|
||||
%{_datadir}/%{vdsm_name}/network/tc/qdisc.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/blockSD.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/blockVolume.py*
|
||||
|
|
@ -1164,6 +1130,7 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/storage/task.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/threadLocal.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/threadPool.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/udevadm.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/volume.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/imageRepository/__init__.py*
|
||||
%{_datadir}/%{vdsm_name}/storage/imageRepository/formatConverter.py*
|
||||
|
|
@ -1227,6 +1194,7 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/dumpStorageTable.py*
|
||||
%{_datadir}/%{vdsm_name}/get-conf-item
|
||||
%{_datadir}/%{vdsm_name}/kaxmlrpclib.py*
|
||||
%{_datadir}/%{vdsm_name}/ksm.py*
|
||||
%{_datadir}/%{vdsm_name}/momIF.py*
|
||||
%{_datadir}/%{vdsm_name}/respawn
|
||||
%{_datadir}/%{vdsm_name}/set-conf-item
|
||||
|
|
@ -1246,7 +1214,7 @@ exit 0
|
|||
%if 0%{?rhel}
|
||||
%dir %{_localstatedir}/log/core
|
||||
%endif
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%{_polkitdir}/10-vdsm-libvirt-access.rules
|
||||
%else
|
||||
%{_polkitdir}/10-vdsm-libvirt-access.pkla
|
||||
|
|
@ -1278,7 +1246,6 @@ exit 0
|
|||
%{_mandir}/man1/vdsm-tool.1*
|
||||
%{_bindir}/vdsm-tool
|
||||
%dir %{python_sitelib}/%{vdsm_name}
|
||||
%dir %{python_sitelib}/%{vdsm_name}/netlink
|
||||
%dir %{python_sitelib}/%{vdsm_name}/tool
|
||||
%{python_sitelib}/%{vdsm_name}/__init__.py*
|
||||
%{python_sitelib}/%{vdsm_name}/compat.py*
|
||||
|
|
@ -1289,41 +1256,32 @@ exit 0
|
|||
%{python_sitelib}/%{vdsm_name}/ipwrapper.py*
|
||||
%{python_sitelib}/%{vdsm_name}/libvirtconnection.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netinfo.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netlink/__init__.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netlink/addr.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netlink/link.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netlink/route.py*
|
||||
%{python_sitelib}/%{vdsm_name}/netlink.py*
|
||||
%{python_sitelib}/%{vdsm_name}/password.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}/sysctl.py*
|
||||
%{python_sitelib}/%{vdsm_name}/utils.py*
|
||||
%{python_sitelib}/%{vdsm_name}/vdscli.py*
|
||||
%{python_sitelib}/%{vdsm_name}/virtsparsify.py*
|
||||
%{python_sitelib}/%{vdsm_name}/xmlrpc.py*
|
||||
%{python_sitelib}/%{vdsm_name}/tool/__init__.py*
|
||||
%if 0%{?rhev_build}
|
||||
#compat
|
||||
%{_datadir}/%{vdsm_name}/config.py*
|
||||
%{_datadir}/%{vdsm_name}/netinfo.py*
|
||||
%endif
|
||||
%if 0%{?with_systemd}
|
||||
%exclude %{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
|
||||
%else
|
||||
%{python_sitelib}/%{vdsm_name}/tool/load_needed_modules.py*
|
||||
%endif
|
||||
%{python_sitelib}/%{vdsm_name}/tool/configfile.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/configurators/multipath.py*
|
||||
%{python_sitelib}/%{vdsm_name}/tool/passwd.py*
|
||||
%{python_sitelib}/%{vdsm_name}/tool/restore_nets.py*
|
||||
%{python_sitelib}/%{vdsm_name}/tool/service.py*
|
||||
|
|
@ -1350,9 +1308,8 @@ exit 0
|
|||
%{_datadir}/%{vdsm_name}/tests/caps_lscpu_ppc64_2_4_8.out
|
||||
%{_datadir}/%{vdsm_name}/tests/caps_numactl_4_nodes.out
|
||||
%{_datadir}/%{vdsm_name}/tests/glob_1c60971a-8647-44ac-ae33-6520887f8843.out
|
||||
%{_datadir}/%{vdsm_name}/tests/ip_route_show_table_all.out
|
||||
%{_datadir}/%{vdsm_name}/tests/iscsiadm_-m_iface.out
|
||||
%{_datadir}/%{vdsm_name}/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
|
||||
%{_datadir}/%{vdsm_name}/tests/iscsiadm_-m_iface.out
|
||||
%{_datadir}/%{vdsm_name}/tests/mem_info.out
|
||||
%{_datadir}/%{vdsm_name}/tests/netmaskconversions
|
||||
%{_datadir}/%{vdsm_name}/tests/run_tests.sh
|
||||
|
|
@ -1425,15 +1382,7 @@ exit 0
|
|||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/30_ethtool_options
|
||||
|
||||
%files hook-ipv6
|
||||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_network_setup/50_ipv6
|
||||
|
||||
%if 0%{?with_hooks}
|
||||
%files hook-allocate_net
|
||||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/10_allocate_net
|
||||
|
||||
%files hook-checkimages
|
||||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/60_checkimages
|
||||
|
|
@ -1481,11 +1430,6 @@ exit 0
|
|||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macbind
|
||||
|
||||
%files hook-noipspoof
|
||||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_noipspoof
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug/50_noipspoof
|
||||
|
||||
%files hook-extnet
|
||||
%defattr(-, root, root, -)
|
||||
%{_libexecdir}/%{vdsm_name}/hooks/before_device_create/50_extnet
|
||||
|
|
@ -1589,10 +1533,8 @@ exit 0
|
|||
%{python_sitelib}/yajsonrpc/stomp.py*
|
||||
%{python_sitelib}/yajsonrpc/stompReactor.py*
|
||||
|
||||
%files infra
|
||||
%{python_sitelib}/%{vdsm_name}/infra/filecontrol/__init__.py*
|
||||
%{python_sitelib}/%{vdsm_name}/infra/zombiereaper/__init__.py*
|
||||
%{python_sitelib}/%{vdsm_name}/infra/__init__.py*
|
||||
%files python-zombiereaper
|
||||
%{python_sitelib}/zombiereaper/__init__.py*
|
||||
|
||||
%files bootstrap
|
||||
%defattr(-, root, root, -)
|
||||
|
|
@ -1652,10 +1594,6 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Mar 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 4.17-0.1
|
||||
- 4.17 pre release
|
||||
- Disable check as it's broken
|
||||
|
||||
* Sun Oct 13 2013 Yaniv Bronhaim <ybronhei@redhat.com> - 4.13.0
|
||||
- Removing vdsm-python-cpopen from the spec
|
||||
- Adding dependency on formal cpopen package
|
||||
|
|
|
|||
Reference in a new issue