[vdsm] vdsm tag 4.14.6-0
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Wed Mar 26 02:48:19 UTC 2014
commit 9c52fef553f884e0bb2b838b9ca67916798c573c
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Tue Mar 25 22:47:57 2014 -0400
vdsm tag 4.14.6-0
sources | 2 +-
vdsm.spec | 36 ++++++++++++++++--------------------
2 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/sources b/sources
index 5da9493..6d70f7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-335c526a486037a5686aa61fafc21b49 vdsm-4.14.5.tar.gz
+eba94d3b7cc56f5226350e1995ee5ad5 vdsm-4.14.6.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 444b458..141ab1f 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -49,7 +49,7 @@
%endif
Name: %{vdsm_name}
-Version: 4.14.5
+Version: 4.14.6
Release: 0%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
@@ -166,6 +166,8 @@ Requires: iscsi-initiator-utils >= 6.2.0.872-15
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
@@ -189,7 +191,6 @@ 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.8, 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
@@ -218,7 +219,6 @@ Requires: initscripts >= 9.42.2-1
%endif
Requires: device-mapper-multipath >= 0.4.9-18
Requires: e2fsprogs >= 1.41.14
-Requires: sanlock >= 2.8, sanlock-python
Requires: policycoreutils-python
Requires: sed >= 4.2.1-10
Requires: ed
@@ -363,7 +363,7 @@ 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
@@ -372,7 +372,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
@@ -383,7 +383,7 @@ 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
@@ -402,7 +402,7 @@ VDSM hook to use vhostmd per VM according to Virtualization Manager requests.
%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
@@ -430,7 +430,7 @@ specific vnics.
%package hook-extnet
Summary: Force a vNIC to connect to a specific libvirt network
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description hook-extnet
VDSM hook which allows to connect a vNIC to a libvirt network that is managed
@@ -521,7 +521,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.
@@ -575,7 +575,7 @@ Hook for vmfex.
%package hook-vmfex-dev
Summary: VM-FEX vNIC support for VDSM
BuildArch: noarch
-Requires: vdsm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Conflicts: hook-vmfex
%description hook-vmfex-dev
@@ -672,12 +672,6 @@ install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
install -dDm 1777 %{buildroot}%{_localstatedir}/log/core
%endif
-%if !0%{?rhel}
-# Install the configuration sample
-install -Dm 0644 lib/vdsm/vdsm.conf.sample \
- %{buildroot}%{_sysconfdir}/%{vdsm_name}/vdsm.conf
-%endif
-
# Install the polkit for libvirt
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
install -Dm 0644 vdsm/vdsm-libvirt-access.rules \
@@ -705,6 +699,7 @@ export LC_ALL=C
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_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
@@ -741,8 +736,8 @@ fi
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 daemon-reload >/dev/null 2>&1 || :
fi
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
exit 0
%endif
@@ -946,6 +941,7 @@ exit 0
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
%{_datadir}/%{vdsm_name}/vm.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
@@ -1134,9 +1130,6 @@ 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*
@@ -1442,6 +1435,9 @@ exit 0
%endif
%changelog
+* 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 -
More information about the scm-commits
mailing list