[vdsm] vdsm-4.16.0-6.git5d3ed2d.fc20

Douglas Schilling Landgraf dougsland at fedoraproject.org
Tue Jul 1 00:57:16 UTC 2014


commit bffb143da2059783f4e989752f686255322a6ecd
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Mon Jun 30 20:57:12 2014 -0400

    vdsm-4.16.0-6.git5d3ed2d.fc20

 sources   |    2 +-
 vdsm.spec |  221 ++++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 138 insertions(+), 85 deletions(-)
---
diff --git a/sources b/sources
index 4d3d185..b64362a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06930dfa60e27d3a418179b6edd40cd7  vdsm-4.14.8.1.tar.gz
+8c6163cbfeb369ebfbd6c4f3ba5b814f  vdsm-4.16.0.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index dcf3cbb..af198e7 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -51,8 +51,8 @@
 %endif
 
 Name:           %{vdsm_name}
-Version:        4.14.8.1
-Release:        1%{?dist}%{?extra_release}
+Version:        4.16.0
+Release:        6.git5d3ed2d%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -83,6 +83,7 @@ BuildRequires: python-ethtool
 BuildRequires: python-inotify
 BuildRequires: python-pthreading
 BuildRequires: python-cpopen >= 1.3
+BuildRequires: python-ioprocess >= 0.5-1
 BuildRequires: rpm-python
 BuildRequires: libnl
 BuildRequires: libselinux-python
@@ -119,7 +120,6 @@ Requires: ethtool
 Requires: which
 Requires: sudo >= 1.7.3
 Requires: logrotate
-Requires: rsyslog
 Requires: xz
 Requires: ntp
 Requires: iproute
@@ -127,6 +127,7 @@ Requires: python-netaddr
 Requires: python-inotify
 Requires: python-argparse
 Requires: python-cpopen >= 1.3
+Requires: python-ioprocess >= 0.5-1
 Requires: python-ethtool >= 0.6-3
 Requires: %{name}-python-zombiereaper = %{version}-%{release}
 Requires: rpm-python
@@ -135,7 +136,9 @@ Requires: m2crypto
 Requires: libguestfs-tools-c
 Requires: libnl
 Requires: %{name}-xmlrpc = %{version}-%{release}
-Requires: mom >= 0.3.2-3
+Requires: %{name}-jsonrpc = %{version}-%{release}
+Requires: mom >= 0.4.1
+Requires: numactl
 
 %ifarch x86_64
 Requires: python-dmidecode
@@ -165,7 +168,7 @@ Requires: iscsi-initiator-utils
 Requires: iscsi-initiator-utils >= 6.2.0.872-15
 %endif # rhel 7
 %else # fedora
-Requires: iscsi-initiator-utils >= 6.2.0.873-3
+Requires: iscsi-initiator-utils >= 6.2.0.873-21
 %endif
 
 Requires: sanlock >= 2.8, sanlock-python
@@ -198,48 +201,32 @@ Requires: policycoreutils >= 2.0.83-19.30
 Requires: policycoreutils-python >= 2.0.83-19.30
 Requires: python-pthreading
 Requires: selinux-policy-targeted >= 3.7.19-195.el6_4.13
-Requires: lvm2 >= 2.02.95-10.el6_3.2
+Requires: lvm2 >= 2.02.100-5
 Requires: logrotate < 3.8.0
 %endif
 %else
-%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
 Requires: qemu-kvm >= 2:0.15.0-4
 Requires: qemu-img >= 2:0.15.0-4
 Requires: python-ethtool >= 0.8-1
-%if 0%{?fedora} >= 18
 Requires: initscripts >= 9.42.2-1
-%endif
 Requires: device-mapper-multipath >= 0.4.9-18
 Requires: e2fsprogs >= 1.41.14
 Requires: policycoreutils-python
 Requires: sed >= 4.2.1-10
 Requires: ed
-Requires: lvm2 >= 2.02.95
-
-%if 0%{?fedora} >= 18
-%if 0%{?fedora} >= 19
+Requires: lvm2 >= 2.02.98-15
 Requires: selinux-policy-targeted >= 3.12.1-71
-%else
-Requires: selinux-policy-targeted >= 3.11.1-103
-%endif
 # 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
 Requires: systemd >= 197-1.fc18.2
 %endif
 
-%endif
-
 # GlusterFS client-side RPMs needed for Gluster SD
 %if 0%{?with_gluster}
 Requires: glusterfs >= 3.4.2
@@ -297,19 +284,12 @@ Requires: %{name}-python = %{version}-%{release}
 An XMLRPC interface for interacting with vdsmd. Primary control interface for
 ovirt-engine and vdsClient.
 
-%package api
-Summary:        VDSM API definition
-BuildArch:      noarch
-
-%description api
-Provides the VDSM API schema and documentation.
-
 %package jsonrpc
 Summary:        VDSM API Server
 BuildArch:      noarch
 
 Requires: %{name}-python = %{version}-%{release}
-Requires: %{name}-api = %{version}-%{release}
+Requires: %{name}-yajsonrpc = %{version}-%{release}
 %if 0%{?rhel} == 6
 Requires: python-ordereddict
 %endif
@@ -350,6 +330,7 @@ BuildArch:      noarch
 Requires: %{name} = %{version}-%{release}
 Requires: m2crypto
 Requires: openssl
+Conflicts: ovirt-node < 3.0.4
 
 %description reg
 VDSM registration package. Used to register a Linux host to a Virtualization
@@ -359,6 +340,8 @@ Manager.
 Summary:        VDSM python libraries
 Requires:       %{name}-python-zombiereaper = %{version}-%{release}
 Requires:       python-cpopen >= 1.2.3-5
+Requires:       m2crypto
+Requires:       python-ioprocess >= 0.5-1
 
 %description python
 Shared libraries between the various VDSM packages.
@@ -391,6 +374,15 @@ Requires:       %{name}
 VDSM hook used to perform consistency check on a qcow2 format disk image
 using the QEMU disk image utility.
 
+%package hook-ethtool-options
+Summary:        Allow setting custom ethtool options for vdsm controlled nics
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+
+%description hook-ethtool-options
+VDSM hook used for applying custom network properties that define ethtool
+options for vdsm network nics
+
 %if 0%{?with_vhostmd}
 %package hook-vhostmd
 Summary:        VDSM hook set for interaction with vhostmd
@@ -420,6 +412,14 @@ BuildArch:      noarch
 VDSM hook enable user to add storage LUN for VDSM
 without the sharing and storage handling of VDSM.
 
+%package hook-macbind
+Summary:        Bind a vNIC to a Bridge
+BuildArch:      noarch
+Requires:       %{name} >= 4.14
+
+%description hook-macbind
+VDSM hooks which allow to bind a vNIC to a Bridge, managed or not by engine.
+
 %package hook-macspoof
 Summary:        Disables MAC spoofing filtering
 BuildArch:      noarch
@@ -438,6 +438,14 @@ Requires:       %{name} = %{version}-%{release}
 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-fakevmstats
+Summary:        Generate random VM statistics
+BuildArch:      noarch
+Requires:       %{name}
+
+%description hook-fakevmstats
+Hook intercepts VM's stats and randomizes various fields.
+
 %package hook-fileinject
 Summary:        Allow uploading file to VMs disk
 BuildArch:      noarch
@@ -566,6 +574,15 @@ BuildArch:      noarch
 sr-iov hook enable to add virtual functions exposed by the device
 directly to a virtual machine.
 
+
+%package hook-spiceoptions
+Summary:        To configure spice options for vm
+BuildArch:      noarch
+
+%description hook-spiceoptions
+This vdsm hook can be used to configure some of
+the spice optimization attributes and values..
+
 %package hook-vmfex
 Summary:        vmfex support for VDSM
 BuildArch:      noarch
@@ -631,7 +648,7 @@ make DESTDIR=%{buildroot} install
 # Creating VDSM logs in this session to avoid rpmbuild
 # complain during the build
 install -dDm 0755 %{buildroot}/var/log/vdsm
-touch %{buildroot}/var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log}
+touch %{buildroot}/var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
 
 # Install the respawn utility
 install -Dm 0755 init/sysvinit/respawn \
@@ -687,6 +704,7 @@ install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \
 # 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
 
 %clean
 rm -rf %{buildroot}
@@ -710,9 +728,9 @@ export LC_ALL=C
 # After vdsm install we should create the logs files.
 # In the install session we create it but since we use
 # the ghost macro (in files session) the files are not included
-touch /var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log}
-chmod 0644 /var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log}
-chown vdsm:kvm /var/log/vdsm/{metadata.log,mom.log,vdsm.log}
+touch /var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
+chmod 0644 /var/log/vdsm/{mom.log,supervdsm.log,vdsm.log}
+chown vdsm:kvm /var/log/vdsm/{mom.log,vdsm.log}
 chown root:root /var/log/vdsm/supervdsm.log
 
 # Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf.
@@ -746,21 +764,7 @@ exit 0
 
 %preun
 if [ "$1" -eq 0 ]; then
-        start_conf_section="## beginning of configuration section by vdsm"
-        end_conf_section="## end of configuration section by vdsm"
-        by_vdsm="by vdsm"
-
-        /bin/sed -i -e "/${start_conf_section}/,/${end_conf_section}/d" \
-                    -e "/${by_vdsm}/d" \
-               %{_sysconfdir}/libvirt/libvirtd.conf \
-               %{_sysconfdir}/logrotate.d/libvirtd \
-               %{_sysconfdir}/libvirt/qemu.conf \
-               %{_sysconfdir}/sysconfig/libvirtd \
-               %{_sysconfdir}/sysctl.conf \
-               %{_sysconfdir}/libvirt/qemu-sanlock.conf
-
-        # Restoring backuped logrotate.d/libvirtd
-        /bin/sed -i -e 's/# VDSM backup//' %{_sysconfdir}/logrotate.d/libvirtd
+        %{_bindir}/vdsm-tool remove-config
 fi
 
 %if ! 0%{?with_systemd}
@@ -776,7 +780,7 @@ then
 
     %{_bindir}/vdsm-tool sebool-unconfig || :
 
-    /usr/sbin/saslpasswd2 -p -a libvirt -d vdsm at ovirt
+    %{_bindir}/vdsm-tool remove-saslpasswd
 
     if /sbin/initctl status libvirtd >/dev/null 2>/dev/null ; then
         /sbin/initctl stop libvirtd  >/dev/null 2>/dev/null
@@ -905,7 +909,6 @@ exit 0
 %endif
 
 %dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center
-%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/metadata.log
 %ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/mom.log
 %ghost %config %attr(0644, root, root) /var/log/vdsm/supervdsm.log
 %ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /var/log/vdsm/vdsm.log
@@ -915,9 +918,11 @@ 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}/network
+%dir %{_datadir}/%{vdsm_name}/network/configurators
 %dir %{_datadir}/%{vdsm_name}/storage
 %dir %{_datadir}/%{vdsm_name}/storage/imageRepository
+%dir %{_datadir}/%{vdsm_name}/virt
 %{_datadir}/%{vdsm_name}/alignmentScan.py*
 %{_datadir}/%{vdsm_name}/blkid.py*
 %{_datadir}/%{vdsm_name}/caps.py*
@@ -932,22 +937,28 @@ exit 0
 %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
 %{_datadir}/%{vdsm_name}/parted_utils.py*
 %{_datadir}/%{vdsm_name}/mkimage.py*
+%{_datadir}/%{vdsm_name}/numaUtils.py*
 %{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
-%{_datadir}/%{vdsm_name}/sourceRoute.py*
-%{_datadir}/%{vdsm_name}/sourceRouteThread.py*
+%{_datadir}/%{vdsm_name}/protocoldetector.py*
 %{_datadir}/%{vdsm_name}/supervdsm.py*
 %{_datadir}/%{vdsm_name}/supervdsmServer
-%{_datadir}/%{vdsm_name}/vmChannels.py*
-%{_datadir}/%{vdsm_name}/tc.py*
 %{_datadir}/%{vdsm_name}/vdsm
 %{_datadir}/%{vdsm_name}/vdsm-restore-net-config
 %{_datadir}/%{vdsm_name}/vdsm-store-net-config
-%{_datadir}/%{vdsm_name}/vm.py*
+%{_datadir}/%{vdsm_name}/virt/__init__.py*
+%{_datadir}/%{vdsm_name}/virt/guestagent.py*
+%{_datadir}/%{vdsm_name}/virt/migration.py*
+%{_datadir}/%{vdsm_name}/virt/vmchannels.py*
+%{_datadir}/%{vdsm_name}/virt/vmstatus.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}/tool
 
 %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
@@ -963,7 +974,6 @@ exit 0
 %{_sysconfdir}/sudoers.d/50_vdsm
 %{_sysconfdir}/cron.hourly/vdsm-logrotate
 %{_sysconfdir}/cron.d/vdsm-libvirt-logrotate
-%{_datadir}/%{vdsm_name}/guestIF.py*
 %{_datadir}/%{vdsm_name}/logUtils.py*
 %{_datadir}/%{vdsm_name}/dsaversion.py*
 %{_libexecdir}/%{vdsm_name}/curl-img-wrap
@@ -972,6 +982,18 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/ovirt_functions.sh
 %{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh
 %{_libexecdir}/%{vdsm_name}/vdsmd_init_common.sh
+%{_datadir}/%{vdsm_name}/network/__init__.py*
+%{_datadir}/%{vdsm_name}/network/api.py*
+%{_datadir}/%{vdsm_name}/network/errors.py*
+%{_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}/storage/__init__.py*
 %{_datadir}/%{vdsm_name}/storage/blockSD.py*
 %{_datadir}/%{vdsm_name}/storage/blockVolume.py*
@@ -1070,23 +1092,20 @@ exit 0
 %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
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_get_vm_stats
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_get_vm_stats
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_get_all_vm_stats
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_get_all_vm_stats
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_get_caps
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_get_caps
 %{_datadir}/%{vdsm_name}/addNetwork
-%{_datadir}/%{vdsm_name}/configNetwork.py*
 %{_datadir}/%{vdsm_name}/delNetwork
 %{_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}/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*
-%{_datadir}/%{vdsm_name}/neterrors.py*
-%{_datadir}/%{vdsm_name}/netmodels.py*
 %{_datadir}/%{vdsm_name}/respawn
-%{_datadir}/%{vdsm_name}/sampling.py*
 %{_datadir}/%{vdsm_name}/set-conf-item
 %if 0%{?with_gluster}
 %dir %{_datadir}/%{vdsm_name}/gluster
@@ -1132,10 +1151,12 @@ exit 0
 
 %files python
 %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*
@@ -1144,9 +1165,11 @@ exit 0
 %{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}/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*
@@ -1158,7 +1181,7 @@ exit 0
 %{python_sitearch}/%{vdsm_name}/tool/dummybr.py*
 %{python_sitearch}/%{vdsm_name}/tool/nwfilter.py*
 %{python_sitearch}/%{vdsm_name}/tool/configurator.py*
-%{_libexecdir}/%{vdsm_name}/libvirt_configure.sh
+%{python_sitearch}/%{vdsm_name}/tool/configfile.py*
 %{python_sitearch}/%{vdsm_name}/tool/passwd.py*
 %{python_sitearch}/%{vdsm_name}/tool/restore_nets.py*
 %{python_sitearch}/%{vdsm_name}/tool/seboolsetup.py*
@@ -1180,14 +1203,25 @@ exit 0
 %{_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_libvirt_intel_i73770.out
+%{_datadir}/%{vdsm_name}/tests/caps_libvirt_intel_i73770_nosnap.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/caps_numactl_4_nodes.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
+%{_datadir}/%{vdsm_name}/tests/toolTests_empty.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_lconf_ssl.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_libvirt_logrotate.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_libvirtd.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_qemu_sanlock.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_qemu_ssl.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_vdsm_no_ssl.conf
+%{_datadir}/%{vdsm_name}/tests/toolTests_vdsm_ssl.conf
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfo.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeProfileInfoNfs.xml
 %{_datadir}/%{vdsm_name}/tests/glusterVolumeRebalanceStatus.xml
@@ -1236,6 +1270,10 @@ exit 0
 %doc COPYING
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_qemucmdline
 
+%files hook-ethtool-options
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/30_ethtool_options
+
 %if 0%{?with_hooks}
 %files hook-checkimages
 %defattr(-, root, root, -)
@@ -1248,6 +1286,10 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_directlun
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_directlun
 
+%files hook-fakevmstats
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/after_get_all_vm_stats/10_fakevmstats
+
 %files hook-fileinject
 %defattr(-, root, root, -)
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_fileinject
@@ -1276,6 +1318,10 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_isolatedprivatevlan
 %config(noreplace) %{_sysconfdir}/libvirt/nwfilter/isolatedprivatevlan-vdsm.xml
 
+%files hook-macbind
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macbind
+
 %files hook-macspoof
 %defattr(-, root, root, -)
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_macspoof
@@ -1327,6 +1373,11 @@ exit 0
 %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_sriov
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_sriov
 
+
+%files hook-spiceoptions
+%defattr(-, root, root, -)
+%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_spiceoptions
+
 %files hook-vmdisk
 %defattr(-, root, root, -)
 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmdisk
@@ -1360,23 +1411,22 @@ exit 0
 %files xmlrpc
 %defattr(-, root, root, -)
 %dir %{_datadir}/%{vdsm_name}
-%{_datadir}/%{vdsm_name}/BindingXMLRPC.py*
-
-%files api
-%doc vdsm_api/vdsm-api.html
-%{_datadir}/%{vdsm_name}/vdsmapi-schema.json
-%{python_sitelib}/vdsmapi.py*
+%{_datadir}/%{vdsm_name}/rpc/BindingXMLRPC.py*
 
 %files jsonrpc
-%{_datadir}/%{vdsm_name}/BindingJsonRpc.py*
-%{_datadir}/%{vdsm_name}/Bridge.py*
+%doc %{vdsm_name}/rpc/vdsm-api.html
+%{_datadir}/%{vdsm_name}/rpc/__init__.py*
+%{_datadir}/%{vdsm_name}/rpc/BindingJsonRpc.py*
+%{_datadir}/%{vdsm_name}/rpc/Bridge.py*
+%{_datadir}/%{vdsm_name}/rpc/vdsmapi-schema.json
+%{python_sitelib}/vdsmapi.py*
+%{python_sitelib}/yajsonrpc/__init__.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*
+%{python_sitelib}/yajsonrpc/betterAsyncore.py*
+%{python_sitelib}/yajsonrpc/stomp.py*
+%{python_sitelib}/yajsonrpc/stompReactor.py*
 
 %files python-zombiereaper
 %{python_sitelib}/zombiereaper/__init__.py*
@@ -1410,7 +1460,6 @@ exit 0
 %{_datadir}/%{vdsm_reg}/deployUtil.py*
 %attr(0755, -, -) %{_datadir}/%{vdsm_reg}/register-to-engine.py*
 %{_datadir}/%{vdsm_reg}/createDaemon.py*
-%{python_sitelib}/ovirt_config_setup/engine.py*
 %{_datadir}/%{vdsm_reg}/save-config
 %{_sysconfdir}/ovirt-config-boot.d/vdsm-config
 %{_sysconfdir}/ovirt-commandline.d/vdsm-reg
@@ -1432,12 +1481,16 @@ exit 0
 %doc COPYING
 %{_datadir}/%{vdsm_name}/gluster/api.py*
 %{_datadir}/%{vdsm_name}/gluster/vdsmapi-gluster-schema.json
+%{_datadir}/%{vdsm_name}/gluster/gfapi.py*
 %{_datadir}/%{vdsm_name}/gluster/hooks.py*
 %{_datadir}/%{vdsm_name}/gluster/services.py*
 %{_datadir}/%{vdsm_name}/gluster/tasks.py*
 %endif
 
 %changelog
+* Mon Jun 30 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.16.0-6.git5d3ed2d
+- vdsm 4.16.0-6.git5d3ed2d
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.14.8.1-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list