From d98b0a7c7a13db845762afcc2ba5e43001f506b3 Mon Sep 17 00:00:00 2001 From: Dan Kenigsberg Date: Feb 28 2012 07:22:40 +0000 Subject: vdsm-4.9.4-0.g5086461 --- diff --git a/.gitignore b/.gitignore index af7bace..04d80b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /vdsm-4.9.3.1.tar.gz /vdsm-4.9.3.2.tar.gz /vdsm-4.9.3.3.tar.gz +/vdsm-4.9.4.tar.gz diff --git a/sources b/sources index 48fbb34..175728f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ee0021516d7908d7353245e56e8e887 vdsm-4.9.3.3.tar.gz +50ee04a9207c5fb7eb30ea46130c8707 vdsm-4.9.4.tar.gz diff --git a/vdsm.spec b/vdsm.spec index b5397a1..8b084a4 100644 --- a/vdsm.spec +++ b/vdsm.spec @@ -4,20 +4,22 @@ %global vdsm_reg vdsm-reg # Upstream release -#% global vdsm_release 1d7b929 -#% global vdsm_relvtag .git%{vdsm_release} +%global vdsm_release b3642e5 +%global vdsm_relvtag .git%{vdsm_release} #% global vdsm_relttag -%{vdsm_release} # Required users and groups %global vdsm_user vdsm %global vdsm_group kvm %global qemu_group qemu +%global snlk_group sanlock +%global snlk_user sanlock # Required paths %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d Name: %{vdsm_name} -Version: 4.9.3.3 +Version: 4.9.4 Release: 0%{?vdsm_relvtag}%{?dist}%{?extra_release} Summary: Virtual Desktop Server Manager @@ -36,6 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: pyflakes +BuildRequires: qemu-kvm %if !0%{?rhel} BuildRequires: systemd-units @@ -45,13 +48,15 @@ Requires: python which Requires: sudo >= 1.7.3 Requires: logrotate >= 3.8.0 Requires: xz +Requires: ntp Requires: python-ethtool Requires: nfs-utils dmidecode Requires: lvm2 >= 2.02.72-8 +Requires: sanlock >= 1.8, sanlock-python %if 0%{?rhel} -Requires: qemu-kvm >= 2:0.12.1.2-2.189 -Requires: qemu-img >= 2:0.12.1.2-2.189 +Requires: qemu-kvm >= 2:0.12.1.2-2.227 +Requires: qemu-img >= 2:0.12.1.2-2.227 Requires: libvirt >= 0.9.4-13 Requires: libvirt-python >= 0.9.4-13 Requires: iscsi-initiator-utils >= 6.2.0.872-15 @@ -275,6 +280,9 @@ install -Dm 0755 vdsm/respawn \ install -Dm 0644 vdsm/storage/12-vdsm-lvm.rules \ %{buildroot}/lib/udev/rules.d/12-vdsm-lvm.rules +install -Dm 0644 vdsm/limits.conf \ + %{buildroot}/etc/security/limits.d/99-vdsm.conf + %if 0%{?rhel} # Install the SysV init scripts install -Dm 0755 vdsm/vdsmd.init %{buildroot}%{_initrddir}/vdsmd @@ -310,12 +318,19 @@ rm -rf %{buildroot} /usr/bin/getent passwd %{vdsm_user} >/dev/null || \ /usr/sbin/useradd -r -u 36 -g %{vdsm_group} -d /var/lib/vdsm \ -s /sbin/nologin -c "Node Virtualization Manager" %{vdsm_user} -/usr/sbin/usermod -a -G %{qemu_group} %{vdsm_user} +/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user} +/usr/sbin/usermod -a -G %{qemu_group},%{vdsm_group} %{snlk_user} %post # update the vdsm "secret" password for libvirt -/usr/sbin/saslpasswd2 -p -a libvirt vdsm@rhevh < \ - /etc/pki/vdsm/keys/libvirt_password +if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then + /usr/sbin/saslpasswd2 -p -a libvirt vdsm@rhevh < \ + /etc/pki/vdsm/keys/libvirt_password +fi + +# generate the vdsm certificates (if missing) +%{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh + %if 0%{?rhel} if [ "$1" -eq 1 ] ; then /sbin/chkconfig --add vdsmd @@ -439,6 +454,8 @@ exit 0 %dir %{_datadir}/%{vdsm_name}/storage %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* +%{_datadir}/%{vdsm_name}/BindingXMLRPC.py* +%{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/constants.py* %{_datadir}/%{vdsm_name}/define.py* %{_datadir}/%{vdsm_name}/get-vm-pid @@ -460,6 +477,7 @@ exit 0 %{_datadir}/%{vdsm_name}/write-net-config %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm +%config(noreplace) %{_sysconfdir}/modprobe.d/vdsm.conf %config(noreplace) %{_sysconfdir}/rwtab.d/vdsm %{_sysconfdir}/sudoers.d/50_vdsm %{_sysconfdir}/cron.hourly/vdsm-logrotate @@ -472,6 +490,7 @@ exit 0 %{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks %{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook %{_libexecdir}/%{vdsm_name}/ovirt_functions.sh +%{_libexecdir}/%{vdsm_name}/vdsm-gencerts.sh %{_datadir}/%{vdsm_name}/storage/__init__.py* %{_datadir}/%{vdsm_name}/storage/blockSD.py* %{_datadir}/%{vdsm_name}/storage/blockVolume.py* @@ -528,6 +547,7 @@ exit 0 %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_migrate_source %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_migrate_destination +%dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_destroy %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vdsm_start %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop @@ -540,10 +560,12 @@ exit 0 %{_datadir}/%{vdsm_name}/set-conf-item %{_datadir}/%{vdsm_name}/kaxmlrpclib.py* %{_datadir}/%{vdsm_name}/config.py* +%{_datadir}/%{vdsm_name}/dumpStorageTable.py* %{_datadir}/%{vdsm_name}/ksm.py* %{_datadir}/%{vdsm_name}/netinfo.py* %{_datadir}/%{vdsm_name}/neterrors.py* /lib/udev/rules.d/12-vdsm-lvm.rules +/etc/security/limits.d/99-vdsm.conf %{python_sitelib}/sos/plugins/vdsm.py* %{_mandir}/man8/vdsmd.8* %if 0%{?rhel} @@ -624,7 +646,7 @@ exit 0 %defattr(-, vdsm, kvm, -) %attr (440,root,root) %{_sysconfdir}/sudoers.d/50_vdsm_hook_promisc %attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/after_vm_start/50_promisc -%attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_promisc +%attr (755,vdsm,kvm) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_destroy/50_promisc %files hook-qos %defattr(-, vdsm, kvm, -) @@ -667,16 +689,15 @@ exit 0 %{_datadir}/%{vdsm_name}/vdsClient.py* %{_sysconfdir}/bash_completion.d/vdsClient %{_datadir}/%{vdsm_name}/vdscli.py* -%{_datadir}/%{vdsm_name}/dumpStorageTable.py* %{_datadir}/%{vdsm_name}/SecureXMLRPCServer.py* %{_mandir}/man1/vdsClient.1* %files bootstrap %defattr(-, root, root, -) %doc COPYING -%attr (755, root, root) %{_datadir}/%{vdsm_bootstrap}/vds_bootstrap.py* +%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap.py* %{_datadir}/%{vdsm_bootstrap}/deployUtil.py* -%attr (755, root, root) %{_datadir}/%{vdsm_bootstrap}/vds_bootstrap_complete.py* +%{_datadir}/%{vdsm_bootstrap}/vds_bootstrap_complete.py* %files reg %defattr(-, root, root, -) @@ -717,6 +738,9 @@ exit 0 %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/10_faqemu %changelog +* Tue Feb 28 2012 Dan Kenigsberg - 4.9.4-0.gb3642e5.fc16 +- vdsm-4.9.4-0.gb3642e5 + * Sun Feb 5 2012 Dan Kenigsberg - 4.9.3.3-0.fc16 - vdsm-4.9.3.3 - BZ#785557 bootstrap: do not mark ifcfg as NM_CONTROLLED