From 8ed99246eb23d3963eb56d92030f9a87e9029dbb Mon Sep 17 00:00:00 2001 From: Yaniv Bronhaim Date: Mar 09 2014 06:55:11 +0000 Subject: Build for vdsm 4.14.5 --- diff --git a/vdsm.spec b/vdsm.spec index ffca1c9..444b458 100644 --- a/vdsm.spec +++ b/vdsm.spec @@ -10,13 +10,19 @@ %global snlk_group sanlock %global snlk_user sanlock +# Upstream git release +# % global vdsm_release gf2f6683 +# % global vdsm_relvtag .git%{vdsm_release} +# % global vdsm_relttag -%{vdsm_release} + # Fedora official build -%global fedora_koji_build 0 +%global fedora_koji_build 1 +%global with_hooks 1 # 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. -%{!?enable_autotools:%define enable_autotools 0} +%{!?enable_autotools:%define enable_autotools 1} # Required paths %if 0%{?fedora} >= 18 @@ -50,7 +56,15 @@ Summary: Virtual Desktop Server Manager Group: Applications/System License: GPLv2+ Url: http://www.ovirt.org/wiki/Vdsm -Source0: %{vdsm_name}-%{version}.tar.gz +# The source for this package was pulled from upstream's vcs. +# Use the following commands to generate the tarball: +# git clone http://gerrit.ovirt.org/p/vdsm +# cd vdsm +# git reset --hard {vdsm_release} +# ./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 @@ -614,8 +628,8 @@ make DESTDIR=%{buildroot} install # Creating VDSM logs in this session to avoid rpmbuild # complain during the build -install -dDm 0755 %{buildroot}/usr/local/var/log/vdsm -touch %{buildroot}/usr/local/var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log} +install -dDm 0755 %{buildroot}/var/log/vdsm +touch %{buildroot}/var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log} # Install the respawn utility install -Dm 0755 init/sysvinit/respawn \ @@ -674,7 +688,9 @@ install -Dm 0644 vdsm/vdsm-libvirt-access.pkla \ %endif %check -make check +# 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=".*" %clean rm -rf %{buildroot} @@ -696,10 +712,10 @@ 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 /usr/local/var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log} -chmod 0644 /usr/local/var/log/vdsm/{metadata.log,mom.log,supervdsm.log,vdsm.log} -chown vdsm:kvm /usr/local/var/log/vdsm/{metadata.log,mom.log,vdsm.log} -chown root:root /usr/local/var/log/vdsm/supervdsm.log +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} +chown root:root /var/log/vdsm/supervdsm.log # Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf. # So Remove them if it is played with /etc/sysctl.conf. @@ -725,8 +741,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 @@ -891,10 +907,10 @@ exit 0 %endif %dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center -%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /usr/local/var/log/vdsm/metadata.log -%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /usr/local/var/log/vdsm/mom.log -%ghost %config %attr(0644, root, root) /usr/local/var/log/vdsm/supervdsm.log -%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) /usr/local/var/log/vdsm/vdsm.log +%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 %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center/hsm-tasks %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) /rhev/data-center/mnt %dir %{_libexecdir}/%{vdsm_name} @@ -1426,17 +1442,342 @@ exit 0 %endif %changelog -* Sun Mar 09 2014 Yaniv Bronhaim - 4.14.5 -- Adding missing 4.14.4 patches to ovirt-3.4 build -- Adding urgent fix to http-1.1 - xmlrpc: [Fix] Use correct -base class for parsing reques - -* Sun Oct 13 2013 Yaniv Bronhaim - 4.13.0 -- Removing vdsm-python-cpopen from the spec -- Adding dependency on formal cpopen package - -* Sun Apr 07 2013 Yaniv Bronhaim - 4.9.0-1 -- Adding cpopen package +* Sun Mar 09 2014 Yaniv Bronhaim - 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 - 4.14.2-0 +- vdsm 4.14.2-0 + +* Thu Feb 06 2014 Yaniv Bronhaim - 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 - 4.14.1-2 +- vdsm.spec: Add BuildRequires to python-argparse + +* Mon Jan 20 2014 Douglas Schilling Landgraf - 4.14.1-1 +- Rebuild 4.14.1 from ovirt-3.4 + +* Mon Jan 20 2014 Douglas Schilling Landgraf - 4.14.1-0 +- Build 4.14.1-0 + +* Mon Jan 13 2014 Yaniv Bronhaim - 4.13.3-1 +- Reverting iscsi changes that caused a regression by importing +zombieReaper package which was not backported + +* Mon Jan 13 2014 Yaniv Bronhaim - 4.13.3 +- spec: bumping iscsi-initiator-utils requirement +- removing redundant check-local from storage makefile +- Adding exception handling in external threads +- fix bridgeless broken network deletion +- gluster api fix +- fix log issues - Changed BrokerLink log level to prevent log flooding +- sampling: make HostStatsThread a daemon thread +- bugfix - BindingXMLRpc - Return lastClientIface for current connection +- vm: Bring back missing before_device_migrate_source hook call +- update NIC: having no custom properies is valid +- prepareVolumePath payload misdetection fix +- fileSD: Fix image deletion on gluster domain +- vm: Update domains list for disks attached to vm after LSM +- prepareVolumePath correct path handling for cdrom + +* Wed Dec 11 2013 Yaniv Bronhaim - 4.13.2-1 +- fix cpopen obsolete loop +- fix threadPool refs +- mom policy fixes +- restorecon hack in spec file +- domainMonitor fixed last check flow + +* Tue Dec 10 2013 Yaniv Bronhaim - 4.13.2-0 +- Bumping minor version due to recent merge of ovirt-3.3 patches + +* Thu Nov 28 2013 Yaniv Bronhaim - 4.13.0-14 +- Adding update patches from branch ovirt-3.3 +- Declaring ovirt-3.3.2 patchsets scope in spec which declares all the merged +new patches + +* Tue Nov 12 2013 Douglas Schilling Landgraf - 4.13.0-11 +- update from branch ovirt-3.3 which include: + upgrade-fix-v3ResetMetaVolSize-argument + lvm-Do-not-use-udev-cache-for-obtaining-device-list + Fix-ballooning-rules-for-computing-the-minimum-avail + Avoid-M2Crypto-races + spec-declare-we-provide-an-existing-python-cpopen + configuring-selinux-allowing-qemu-kvm-to-generate-co + +* Tue Nov 12 2013 Douglas Schilling Landgraf - 4.13.0-10 +- Fix requires on post for hostname. + +* Tue Nov 05 2013 Douglas Schilling Landgraf - 4.13.0-9 +- Build 4.13.0-9 from branch ovirt-3.3 + +* Wed Oct 30 2013 Cole Robinson - 4.12.1-5 +- Fix broken hostname dep on rawhide + +* Thu Oct 10 2013 Douglas Schilling Landgraf 4.12.1-4 +- remoteFileHandler: Add create exclusive option for truncateFile (BZ#979193) +- oop: improve safety for truncateFile + +* Tue Oct 08 2013 Douglas Schilling Landgraf 4.12.1-3 +- vm.Vm._getUnderlyingDriveInfo: extract path of gluster disks (BZ#1007980) +- Require libvirt that allows vmUpdateDevice (BZ#1001001) +- imageSharing: return proper size in httpGetSize +- vdsmd.init: Add service-is-managed in shutdown_conflicting_srv (BZ#1006842) + +* Tue Sep 10 2013 Federico Simoncelli 4.12.1-2 +- systemd init: no need to stop conflicting services (BZ#999664) + +* Tue Aug 27 2013 Federico Simoncelli 4.12.1-1 +- update to 4.12.1 + +* Thu Aug 22 2013 Federico Simoncelli 4.12.0-2 +- Fix GlusterFS RPM dep to support GlusterFS SD (BZ#988299) + +* Tue Aug 13 2013 Federico Simoncelli 4.12.0-1 +- update to 4.12.0 final release +- mom: Require latest mom +- Mark ksmtuned as conflicting service in the init file +- spec: vdsm-hook-sriov on el6 should not require +- Crash fix for migrations that involve devices with no aliases (BZ#988065) +- vdsm: Always retrieve alias for Balloon and Console (BZ#988065) +- vdsm: Fix regression introduced by refactoring (BZ#985735) +- VDSM now writes its version number in VDSM-generated +- Bump requires version of selinux-policy-targeted +- vdsm_reg: fix ovirt_node without default bridge (BZ#988990) +- Source Route script now checks that the DHCP response (BZ#994600) +- Management network is now kept in main routing table (BZ#984028) +- Only remove dhcp source routing if the removal reason (BZ#995142) +- image: use successor volume size when merging + +* Sun Aug 04 2013 Fedora Release Engineering - 4.12.0-0.2.rc3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Federico Simoncelli 4.12.0-0.1.rc3 +- update to vdsm-4.12.0-rc3 + +* Wed Jul 10 2013 Douglas Schilling Landgraf 4.10.3-18 +- vdsm.spec: update python-pthreading +- service: make iscsid a systemd dependency + +* Tue Jun 4 2013 Douglas Schilling Landgraf 4.10.3-17 +- Makefile.am: ignore false positive pyflakes lvm.py +- Deactivate libvirtVM.Drives() +- vdsm: fix Vm cleanup routine +- Support teardownVolumePath(None) + +* Tue Apr 23 2013 Federico Simoncelli 4.10.3-16 +- Don't user sudo in fuser +- svdsm: fix fuser import in supervdsmServer +- Removing vdsm configuration when removing vdsm service +- Seperating supervdsm log to supervdsm.log file +- vdsm.spec: Adding with_systemd macro +- spec: use the fedora systemd macros +- spec: enable gluster upstream and on fedora 19 + +* Tue Apr 9 2013 Federico Simoncelli 4.10.3-15 +- fix the patches backported to ovirt-3.2 +- resync the fedora spec file with the upstream one + +* Mon Apr 8 2013 Federico Simoncelli 4.10.3-14 +- fix storage.fuser +- Bump up libvirt version to fix network linking. + +* Wed Apr 3 2013 Douglas Schilling Landgraf 4.10.3-13 +- Temporarily deactivate Gluster sub-package. + +* Tue Mar 26 2013 Douglas Schilling Landgraf 4.10.3-12 +- Applying direct to spec the fence-agents changes and removing the patch. + +* Mon Mar 25 2013 Douglas Schilling Landgraf 4.10.3-11 +- adapt vdsm.spec to new fence-agents package name. + +* Thu Mar 14 2013 Federico Simoncelli 4.10.3-10 +- gluster: Handling Attribute error in Python 2.6 +- bootstrap: remove glusterfs packages +- gluster: set glusterfs dependency version +- Do not delete the template when zeroing a dependant + +* Wed Feb 27 2013 Federico Simoncelli 4.10.3-9 +- packaging: add load_needed_modules.py.in +- tool: _enable_bond_dev: reopen bonding_masters per bond + +* Tue Feb 19 2013 Federico Simoncelli 4.10.3-8 +- configNet: allow delete/update of devices with no ifcfg (#906383) +- Requires policycoreutils-2.1.13-55 to avoid another +- After fail to connect to supervdsm more than 3 time + +* Thu Feb 14 2013 Federico Simoncelli 4.10.3-7 +- Fedora 18: require a newer udev (applied properly to the fedora specfile) + +* Wed Jan 30 2013 Federico Simoncelli 4.10.3-6 +- Explicitly shutdown m2crypto socket +- spec: require policycoreutils and skip sebool errors +- spec: requires selinux-policy to avoid selinux failure +- vdsmd.service: require either ntpd or chronyd +- isRunning didn't check local variable before reading +- udev: Race fix- load and trigger dev rule (#891300) +- Change scsi_id command path to be configured at runtime (#886087) +- upgrade: force upgrade to v2 before upgrading to v3 (#893184) +- misc: rename safelease to clusterlock +- domain: select the cluster lock using makeClusterLock +- clusterlock: add the local locking implementation (#877715) +- upgrade: catch MetaDataKeyNotFoundError when preparing +- vdsm.spec: Require openssl (#905728) +- Fedora 18: require a newer udev +- fix sloppy backport of safelease rename +- removing the use of zombie reaper from supervdsm + +* Fri Jan 18 2013 Douglas Schilling Landgraf 4.10.3-5 +- Searching for both py and pyc file to start super vdsm +- adding getHardwareInfo API to vdsm + +* Tue Jan 15 2013 Douglas Schilling Landgraf 4.10.3-4 +- python-ordereddict only for rhel more then 7 +- dont require python ordereddict on fedora +- BuildRequires python-pthreading + +* Wed Jan 02 2013 Federico Simoncelli 4.10.3-3 +- caps.py: osversion() validate OVIRT +- restarting libvirtd didn't work over allinone setup +- Integrate Smartcard support + +* Thu Dec 27 2012 Federico Simoncelli 4.10.3-2 +- api: Report CPU thread info in getVdsCapabilities +- schema: Missing comment for new VmDeviceType +- schema: Fix schema for VM.updateDevice + +* Wed Dec 12 2012 Federico Simoncelli 4.10.3-1 +- vdsm-4.10.3 + +* Mon Nov 5 2012 Douglas Schilling Landgraf 4.10.1-100.gf2f6683 +- vdsm-4.10.1-100-gf2f6683 + +* Wed Oct 31 2012 Douglas Schilling Landgraf 4.10.1-1 +- vdsm-4.10.1 +- merged vdsm.spec from f17 with last upstream vdsm.spec + +* Wed Oct 24 2012 Federico Simoncelli 4.10.0-12 +- configure selinux for sanlock on nfs + +* Sat Oct 20 2012 Peter Robinson 4.10.0-11 +- Merge F17 changes into F18+ and disable make check due to pep8 issues +- Add pyparted dependency + +* Thu Oct 4 2012 Federico Simoncelli 4.10.0-10 +- BZ#845660 Use buffer size in multiplies of the recommended transfer size + +* Mon Sep 24 2012 Federico Simoncelli 4.10.0-9 +- BZ#845660 Use the recommended alignment instead of using pagesize + +* Tue Sep 11 2012 Federico Simoncelli 4.10.0-8 +- add the autotools support + +* Fri Aug 17 2012 Federico Simoncelli 4.10.0-7 +- enable all the vdsm hooks + +* Wed Aug 1 2012 Federico Simoncelli 4.10.0-6 +- BZ#842948: deployUtil - safely remove bridge + +* Tue Jul 17 2012 Federico Simoncelli 4.10.0-5 +- configNet: atomicBackup: remove new files upon restore +- configNet: clear up atomicBackup arg +- Remove redundant 'explicitBonding' parameter from setupNetworks +- BZ#837054 - Do not detach network from the bond during bond resize +- BZ#836954 - Allow to break bond and create a new network on its interface in single action. +- BZ#837443: remove bridge before add VDSM bridge +- BZ#837443: removeVlan() drop/remove interface +- configNetwork: fix NetInfo call +- BZ#837443: replace the netinfo import +- BZ#837443: removeBridge() drop/remove interface +- ovirt_functions: fix elif statement +- BZ#838097 _addNetworkValidation: do not explode if STP/DNS1 option passed +- BZ#832199: move selinux from init to spec +- bump libvirt version to fix readonly lease unsupported issue + +* Fri Jun 29 2012 Federico Simoncelli 4.10.0-4 +- deployUtil: use os.uname instead of /bin/uname +- deployUtil: slightly saner kernel version comparison +- BZ#835784 - Allow to create a network on top of existing bond in additional + to create a new bond and network +- BZ#833119 - Allow to create VLANed network on top of existing bond +- BZ#833803 - Avoid bond breaking after network detach +- Handle bond properly if connectivity check fail. +- BZ#806555 having /etc/ovirt-node-* means it is a node + +* Tue Jun 26 2012 Federico Simoncelli 4.10.0-3 +- BZ#832577: node can't be approved +- BZ#824298 fix typo in keyword argument exc_info + +* Wed Jun 20 2012 Federico Simoncelli 4.10.0-2 +- deployUtil.yumFind: rename and simplify semantics +- drop deployUtil.yumSearch +- deployUtil.yumSearchVersion: compare versions sanely +- Iterates over delete candidates networks only once +- 'options' translation in setupNetworks is not relevant +- Minor optimization for delNetwork +- Don't ignore bridgeless networks in ifaceUsers +- Minor optimization for addNetwork +- Use already known iface in addNetwork +- Use proper MTU on bonding when add network +- Add bridge on top of VLAN if exists +- BZ#830485 - Add netConfigDirty bit to getVdsCaps report +- remove flag skipLibvirt +- BZ#826873 - Allow to change bond without network attached to it +- BZ#830486 - Allow to change network according the diffs from previous state +- BZ#826467 - Allow to remove bond and attach network to NIC +- Related to BZ#826873 - Allow to create bond without network + +* Mon Jun 11 2012 Federico Simoncelli 4.10.0-1 +- vdsm-4.10.0 + +* Mon Jun 4 2012 Federico Simoncelli 4.9.6-2.gite952471 +- BZ#822158 Report version-release in a short format + +* Mon Jun 4 2012 Federico Simoncelli 4.9.6-1.gite952471 +- vdsm-4.9.6-ge952471 + +* Mon May 28 2012 Federico Simoncelli 4.9.6-0.git1b07249 +- vdsm-4.9.6-g1b07249 + +* Tue Feb 28 2012 Dan Kenigsberg - 4.9.4-0.gb3642e5 +- vdsm-4.9.4-0.gb3642e5 + +* Wed Jan 25 2012 Dan Kenigsberg - 4.9.3.2-0 +- vdsm-4.9.3.2 +- Reverts "BZ#773666 - Fix HSM flows should not change rw permissions." + +* Mon Jan 16 2012 Federico Simoncelli - 4.9.3.1-0 +- vdsm-4.9.3.1 + +* Fri Jan 13 2012 Dan Kenigsberg - 4.9.2-1.git1d7b929 +- vdsm-4.9.2-g1d7b929 + +* Tue Jan 10 2012 Federico Simoncelli - 4.9.2-0.git951b41d +- vdsm-4.9.2-g951b41d + +* Fri Dec 02 2011 Federico Simoncelli - 4.9.1-2.git931a43e +- add the revision control comments to the specfile + +* Wed Nov 30 2011 Federico Simoncelli - 4.9.1-1.git6ee166c +- require iscsi-initiator-utils >= 6.2.0.872-14 bz442980 +- fix the rpmlint errors * Wed Oct 12 2011 Federico Simoncelli - 4.9.0-0 - Initial upstream release