diff --git a/mom.spec b/mom.spec index 8768144..34ec34b 100644 --- a/mom.spec +++ b/mom.spec @@ -8,10 +8,8 @@ Summary: Dynamically manage system resources on virtualization hosts Group: Applications/System License: GPLv2 -URL: http://wiki.github.com/aglitke/mom -Source0: http://github.com/downloads/aglitke/mom/%{name}-%{version}.tar.gz -Patch0: Fix-ever-increasing-CPU-usage.patch - +URL: http://www.ovirt.org +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -21,7 +19,13 @@ BuildRequires: python-nose # MOM makes use of libvirt by way of the python bindings to monitor and # interact with virtual machines. -Requires: libvirt, libvirt-python +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +Requires: libvirt-daemon-driver-qemu +%else +Requires: libvirt +%endif +Requires: libvirt-python +Requires: procps Requires(post): chkconfig Requires(postun): initscripts @@ -29,24 +33,22 @@ Requires(preun): chkconfig Requires(preun): initscripts %description -MOM is a policy-driven tool that can be used to manage overcommitment on KVM -hosts. Using libvirt, MOM keeps track of active virtual machines on a host. At -a regular collection interval, data is gathered about the host and guests. Data -can come from multiple sources (eg. the /proc interface, libvirt API calls, a -client program connected to a guest, etc). Once collected, the data is -organized for use by the policy evaluation engine. When started, MOM accepts a -user-supplied overcommitment policy. This policy is regularly evaluated using -the latest collected data. In response to certain conditions, the policy may -trigger reconfiguration of the system’s overcommitment mechanisms. Currently -MOM supports control of memory ballooning and KSM but the architecture is +MOM is a policy-driven tool that can be used to manage overcommitment on KVM +hosts. Using libvirt, MOM keeps track of active virtual machines on a host. At +a regular collection interval, data is gathered about the host and guests. Data +can come from multiple sources (eg. the /proc interface, libvirt API calls, a +client program connected to a guest, etc). Once collected, the data is +organized for use by the policy evaluation engine. When started, MOM accepts a +user-supplied overcommitment policy. This policy is regularly evaluated using +the latest collected data. In response to certain conditions, the policy may +trigger reconfiguration of the system’s overcommitment mechanisms. Currently +MOM supports control of memory ballooning and KSM but the architecture is designed to accommodate new mechanisms such as cgroups. %prep %setup -q -%patch0 -p1 -sed -i -e 's|/usr/share/doc/mom/|%{_pkgdocdir}/|' setup.py.in %build echo "v%{version}-%{release}" > VERSION @@ -59,10 +61,14 @@ make rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT install -Dp contrib/momd.init $RPM_BUILD_ROOT/%{_initrddir}/momd + cp -p $RPM_BUILD_ROOT/%{_pkgdocdir}/examples/mom-balloon+ksm.conf \ $RPM_BUILD_ROOT/%{_sysconfdir}/momd.conf cp -p COPYING README $RPM_BUILD_ROOT/%{_pkgdocdir} +%check +# Temporarily disabled while debugging test failures in koji +# nosetests tests/*.py %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +105,9 @@ fi %changelog +* Fri Jan 10 2014 Adam Litke - 0.3.2-8 +- Sync Fedora spec file with package spec file + * Wed Dec 11 2013 Ville Skyttä - 0.3.2-7 - Install docs to %%{_pkgdocdir} where available (#993977). @@ -120,7 +129,7 @@ fi * Tue Jul 16 2013 Adam Litke - 0.3.2-1 - Upgrade to version 0.3.2 -- Policy updates to support oVirt +- Policy updates to support oVirt * Mon Jul 8 2013 Adam Litke - 0.3.1-1 - Upgrade to version 0.3.1