[vdsm] update to vdsm-4.10.3-1
Federico Simoncelli
fsimonce at fedoraproject.org
Wed Dec 12 12:34:42 UTC 2012
commit e18cab929f8ae74fc5fe8525e8923c0affa13893
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Wed Dec 12 13:33:03 2012 +0100
update to vdsm-4.10.3-1
vdsm-4.10.3-1
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
sources | 2 +-
vdsm.spec | 155 ++++++++++++++++++++++++++++++++++++------------------------
2 files changed, 94 insertions(+), 63 deletions(-)
---
diff --git a/sources b/sources
index e59e5b1..d373508 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc9d0e809808877a52555484ffb29025 vdsm-4.10.1-gf2f6683.tar.gz
+6e181a25b2b4fc9e5f85faafc9d73aa1 vdsm-4.10.3.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 3f811c9..dc0a536 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -3,10 +3,10 @@
%global vdsm_bootstrap vdsm-bootstrap
%global vdsm_reg vdsm-reg
-# Upstream release
-%global vdsm_release gf2f6683
-%global vdsm_relvtag .git%{vdsm_release}
-%global vdsm_relttag -%{vdsm_release}
+# Upstream git release
+# % global vdsm_release gf2f6683
+# % global vdsm_relvtag .git%{vdsm_release}
+# % global vdsm_relttag -%{vdsm_release}
# Required users and groups
%global vdsm_user vdsm
@@ -31,7 +31,7 @@
%{!?enable_autotools:%define enable_autotools 1}
Name: %{vdsm_name}
-Version: 4.10.1
+Version: 4.10.3
Release: 1%{?vdsm_relvtag}%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
@@ -55,9 +55,14 @@ BuildRequires: python-nose
# BuildRequires needed by the tests during the build
BuildRequires: python-ethtool
+BuildRequires: libselinux-python
BuildRequires: libvirt-python
-BuildRequires: sanlock-python >= 2.3
BuildRequires: genisoimage
+BuildRequires: openssl
+BuildRequires: m2crypto
+%if 0%{?rhel}
+BuildRequires: python-ordereddict
+%endif
# Autotools BuildRequires
%if 0%{?enable_autotools}
@@ -71,11 +76,12 @@ BuildRequires: libtool
BuildRequires: pyflakes
BuildRequires: python-pep8
BuildRequires: systemd-units
+BuildRequires: python-pthreading
%endif
Requires: which
Requires: sudo >= 1.7.3
-Requires: logrotate >= 3.8.0
+Requires: logrotate
Requires: xz
Requires: ntp
Requires: iproute
@@ -83,43 +89,61 @@ Requires: python-ethtool
Requires: rpm-python
Requires: nfs-utils
Requires: python-pthreading
+Requires: m2crypto
+Requires: %{name}-xmlrpc = %{version}-%{release}
%ifarch x86_64
Requires: dmidecode
%endif
%if 0%{?rhel}
+%if 0%{?rhel} >= 7
+ExclusiveArch: x86_64
+Requires: device-mapper-multipath
+Requires: e2fsprogs
+Requires: iscsi-initiator-utils
+Requires: libvirt
+Requires: lvm2
+Requires: python
+Requires: qemu-kvm
+Requires: qemu-kvm-img
+Requires: sanlock, sanlock-python
+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: libvirt >= 0.9.10-21.el6_3.5
-Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
Requires: iscsi-initiator-utils >= 6.2.0.872-15
Requires: device-mapper-multipath >= 0.4.9-52
Requires: e2fsprogs >= 1.41.12-11
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: mom >= 0.3.0
Requires: selinux-policy-targeted >= 3.7.19-80
Requires: lvm2 >= 2.02.95-10.el6_3.2
+Requires: logrotate < 3.8.0
+%endif
%else
# Subprocess and thread bug was found on python 2.7.2
Requires: python >= 2.7.3
Requires: qemu-kvm >= 2:0.15.0-4
Requires: qemu-img >= 2:0.15.0-4
Requires: libvirt >= 0.10.1-1
-Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
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: mom >= 0.3.0
Requires: sanlock >= 2.4-2, sanlock-python
Requires: sed >= 4.2.1-10
Requires: selinux-policy-targeted >= 3.10.0-149
Requires: lvm2 >= 2.02.95
%endif
+Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
Requires: psmisc >= 22.6-15
Requires: fence-agents
Requires: bridge-utils
@@ -132,9 +156,10 @@ Requires: libselinux-python
Requires: %{name}-python = %{version}-%{release}
Requires: pyparted
-Requires(pre,preun): policycoreutils-python
Requires(post): /usr/sbin/saslpasswd2
Requires(post): /bin/hostname
+Requires(post): policycoreutils-python
+Requires(preun): policycoreutils-python
%description
The VDSM service is required by a Virtualization Manager to manage the
@@ -162,15 +187,17 @@ Requires: %{name}-python = %{version}-%{release}
An XMLRPC interface for interacting with vdsmd. Primary control interface for
ovirt-engine and vdsClient.
-%package rest
-Summary: VDSM REST API
+%package jsonrpc
+Summary: VDSM API Server
BuildArch: noarch
Requires: %{name}-python = %{version}-%{release}
-Requires: python-cherrypy python-cheetah
+%if 0%{?rhel}
+Requires: python-ordereddict
+%endif
-%description rest
-A REST interface for interacting with vdsmd.
+%description jsonrpc
+A Json-based RPC interface that serves as the protocol for libvdsm.
%package bootstrap
Summary: VDSM bootstrapping package
@@ -195,7 +222,7 @@ Manager.
Summary: VDSM python libraries
%description python
-Shared libraries beween the various VDSM packages.
+Shared libraries between the various VDSM packages.
%package debug-plugin
Summary: VDSM Debug Plugin
@@ -285,6 +312,14 @@ hook prevent VM from spoofing its mac or ip address
by using <filterref filter='clean-traffic'/> libvirt filter
and by adding custom filter: isolatedprivatevlan-vdsm.xml
+%package hook-nestedvt
+Summary: Nested Virtualization support for VDSM
+BuildArch: noarch
+
+%description hook-nestedvt
+If the nested virtualization is enabled in your kvm module
+this hook will expose it to the guests.
+
%package hook-numa
Summary: numa sopport for VDSM
BuildArch: noarch
@@ -360,6 +395,13 @@ BuildArch: noarch
sr-iov hook enable to add virtual functions exposed by the device
directly to a virtual machine.
+%package hook-vmfex
+Summary: vmfex support for VDSM
+BuildArch: noarch
+
+%description hook-vmfex
+Hook for vmfex.
+
%package hook-vmdisk
Summary: External disk support for VDSM
BuildArch: noarch
@@ -379,6 +421,9 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%prep
%setup -q
+%if 0%{?rhel} == 6
+sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
+%endif
%build
%if 0%{?enable_autotools}
@@ -456,30 +501,8 @@ export LC_ALL=C
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user}
/usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user}
-# vdsm makes extensive use of nfs-exported images
-# The next lines will collect the default selinux behaviour for the booleans
-virtNFS=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_nfs | cut -d ',' -f 2)
-virtSANLOCK=$(/usr/sbin/semanage boolean -l | /bin/grep virt_use_sanlock | cut -d ',' -f 2)
-snlkNFS=$(/usr/sbin/semanage boolean -l | /bin/grep sanlock_use_nfs | cut -d ',' -f 2)
-
-# Set the booleans and persist it across reboots
-if [[ "${virtNFS}" == *off* || "${virtSANLOCK}" == *off* || \
- "${snlkNFS}" == *off* ]]; then
- /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF
-virt_use_nfs=1
-virt_use_sanlock=1
-sanlock_use_nfs=1
-_EOF
-fi
-
-# Set the current state of SELinux booleans
-if /usr/sbin/selinuxenabled; then
- /usr/sbin/setsebool virt_use_nfs on
- /usr/sbin/setsebool virt_use_sanlock on
- /usr/sbin/setsebool sanlock_use_nfs on
-fi
-
%post
+%{_bindir}/vdsm-tool sebool-config
# set the vdsm "secret" password for libvirt
%{_bindir}/vdsm-tool set-saslpasswd
@@ -521,17 +544,7 @@ then
/bin/sed -i '/# VDSM section begin/,/# VDSM section end/d' \
/etc/sysctl.conf
- /usr/sbin/semanage boolean -m -S targeted -F /dev/stdin << _EOF
-virt_use_nfs=0
-virt_use_sanlock=0
-sanlock_use_nfs=0
-_EOF
-
- if /usr/sbin/selinuxenabled; then
- /usr/sbin/setsebool virt_use_nfs off
- /usr/sbin/setsebool virt_use_sanlock off
- /usr/sbin/setsebool sanlock_use_nfs off
- fi
+ %{_bindir}/vdsm-tool sebool-unconfig
/usr/sbin/saslpasswd2 -p -a libvirt -d vdsm at ovirt
@@ -627,7 +640,6 @@ exit 0
%{_datadir}/%{vdsm_name}/API.py*
%{_datadir}/%{vdsm_name}/hooking.py*
%{_datadir}/%{vdsm_name}/hooks.py*
-%{_datadir}/%{vdsm_name}/libvirtev.py*
%{_datadir}/%{vdsm_name}/libvirtvm.py*
%{_datadir}/%{vdsm_name}/lsblk.py*
%{_datadir}/%{vdsm_name}/md_utils.py*
@@ -643,6 +655,8 @@ exit 0
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
%{_datadir}/%{vdsm_name}/vm.py*
%{_datadir}/%{vdsm_name}/write-net-config
+%{_datadir}/%{vdsm_name}/zombieReaper.py*
+%attr (755,vdsm,kvm) %{_datadir}/%{vdsm_name}/dummybr.py*
%attr (755,vdsm,kvm) %{_datadir}/%{vdsm_name}/nwfilter.py*
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
%config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.conf
@@ -724,6 +738,12 @@ exit 0
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_set_ticket
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_set_ticket
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotplug
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_nic_hotunplug
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotunplug
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotplug_fail
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_nic_hotunplug_fail
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vdsm_start
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop
%{_datadir}/%{vdsm_name}/addNetwork
@@ -787,9 +807,10 @@ exit 0
%{python_sitearch}/%{vdsm_name}/betterPopen/__init__.py*
%{python_sitearch}/%{vdsm_name}/betterPopen/createprocess.so
%{python_sitearch}/%{vdsm_name}/tool/__init__.py*
+%{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
%{python_sitearch}/%{vdsm_name}/tool/passwd.py*
+%{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py*
%{python_sitearch}/%{vdsm_name}/tool/validate_ovirt_certs.py*
-%{python_sitearch}/%{vdsm_name}/tool/load_needed_modules.py*
%files tests
%doc %{_datadir}/%{vdsm_name}/tests/README
@@ -803,6 +824,8 @@ exit 0
%{_datadir}/%{vdsm_name}/tests/run_tests.sh
%{_datadir}/%{vdsm_name}/tests/route_info.out
%{_datadir}/%{vdsm_name}/tests/tc_filter_show.out
+%{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml
+%{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
%{_datadir}/%{vdsm_name}/tests/functional/*.py*
%files hook-vhostmd
@@ -855,6 +878,11 @@ exit 0
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_isolatedprivatevlan
%config(noreplace) %{_sysconfdir}/libvirt/nwfilter/isolatedprivatevlan-vdsm.xml
+%files hook-nestedvt
+%defattr(-, root, root, -)
+%{_sysconfdir}/modprobe.d/vdsm-nestedvt.conf
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_nestedvt
+
%files hook-numa
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_numa
@@ -897,6 +925,11 @@ exit 0
%files hook-vmdisk
%defattr(-, root, root, -)
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmdisk
+
+%files hook-vmfex
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vmfex
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmfex
%endif
%files debug-plugin
@@ -917,15 +950,11 @@ exit 0
%defattr(-, root, root, -)
%{_datadir}/%{vdsm_name}/BindingXMLRPC.py*
-%files rest
-%defattr(-, root, root, -)
-%{_datadir}/%{vdsm_name}/rest/__init__.py*
-%{_datadir}/%{vdsm_name}/rest/BindingREST.py*
-%{_datadir}/%{vdsm_name}/rest/Dispatcher.py*
-%{_datadir}/%{vdsm_name}/rest/Controller.py*
-%{_datadir}/%{vdsm_name}/rest/templates/*.x
-%{_datadir}/%{vdsm_name}/rest/templates/api.xsd
-%{_datadir}/%{vdsm_name}/rest/templates/rsdl.xml
+%files jsonrpc
+%{_datadir}/%{vdsm_name}/BindingJsonRpc.py*
+%{_datadir}/%{vdsm_name}/Bridge.py*
+%{_datadir}/%{vdsm_name}/vdsmapi.py*
+%{_datadir}/%{vdsm_name}/vdsmapi-schema.json
%files bootstrap
%defattr(-, root, root, -)
@@ -949,7 +978,6 @@ exit 0
%{_unitdir}/vdsm-reg.service
%endif
%{_datadir}/%{vdsm_reg}/vdsm-reg-setup
-%{_datadir}/%{vdsm_reg}/define.py*
%{_datadir}/%{vdsm_reg}/vdsm-complete
%{_datadir}/%{vdsm_reg}/vdsm-gen-cert
%{_datadir}/%{vdsm_reg}/vdsm-upgrade
@@ -985,6 +1013,9 @@ exit 0
%{_datadir}/%{vdsm_name}/gluster/hostname.py*
%changelog
+* Wed Dec 12 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-1
+- vdsm-4.10.3
+
* Mon Nov 5 2012 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.1-100.gf2f6683
- vdsm-4.10.1-100-gf2f6683
More information about the scm-commits
mailing list