[ovirt-node] * Tue Feb 12 2013 Mike Burns <mburns at redhat.com> 2.6.0-1 - Update to upstream 2.6.0 release
mburns72h
mburns72h at fedoraproject.org
Tue Feb 12 22:59:37 UTC 2013
commit 461c72359cc4bb0343ef69a37ff7f4e76b691e2e
Author: Mike Burns <mburns at redhat.com>
Date: Tue Feb 12 17:59:07 2013 -0500
* Tue Feb 12 2013 Mike Burns <mburns at redhat.com> 2.6.0-1
- Update to upstream 2.6.0 release
.gitignore | 1 +
ovirt-node.spec | 154 +++++++++++++++++++++++++++++++++++++++++--------------
sources | 2 +-
3 files changed, 117 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e441132..46a586d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/ovirt-node-2.2.3.tar.gz
/ovirt-node-2.3.0.tar.gz
/ovirt-node-2.5.1.tar.gz
+/ovirt-node-2.6.0.tar.gz
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 558510e..47eb504 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -3,12 +3,16 @@
%global mgmt_scripts_dir %{_sysconfdir}/node.d
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%define is_f16 %(test "0%{?fedora}" == "016" && echo 1 || echo 0)
-
+%define is_fedora_systemd %(test 0%{?fedora} -ne 0 && test %{?fedora} -ge 16 && echo 1 || echo 0)
+%define is_rhel_systemd %(test 0%{?rhel} -ne 0 && test %{?rhel} -ge 7 && echo 1 || echo 0)
+%define is_centos_systemd %(test 0%{?centos} -ne 0 && test %{?centos} -ge 7 && echo 1 || echo 0)
+%define is_systemd %( test %{is_rhel_systemd} -eq 1 || test %{is_centos_systemd} = 1 || test %{is_fedora_systemd} = 1 && echo 1 || echo 0)
+%define dracutdir %(test -e /usr/share/dracut && echo "/usr/share/dracut/modules.d" || echo "/usr/lib/dracut/modules.d")
Summary: The %{product_family} daemons/scripts
Name: ovirt-node
-Version: 2.5.1
+Version: 2.6.0
Release: 1%{?extra_release}%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
@@ -16,15 +20,15 @@ Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
URL: http://www.ovirt.org/
-BuildRequires: python-setuptools python-devel
+BuildRequires: python-setuptools python-devel dracut
BuildRequires: automake autoconf
-%if 0%{?fedora}
+%if %{is_systemd}
BuildRequires: systemd-units
%endif
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
-%if 0%{?fedora}
+%if %{is_systemd}
Requires: systemd-units
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -58,10 +62,11 @@ Requires: PyPAM
Requires: ethtool
Requires: cracklib-python
Requires: dracut
-%if 0%{?rhel}
+Requires: /bin/hostname
+%if ! %{is_systemd}
Requires: grub
# for applying patches in %post
-Requires: patch
+Requires(post): patch
%endif
%if 0%{?rhel} && ! 0%{?centos}
Requires: system-release
@@ -79,7 +84,7 @@ Provides a series of daemons and support utilities for hypervisor distribution.
Summary: Recipes for building and running %{product_family} image
Group: Applications/System
Requires: pykickstart >= 1.54
-Requires: livecd-tools >= 020-2
+Requires: livecd-tools >= 1:16.0
Obsoletes: ovirt-node-tools <= 2.3.0-999
%define recipe_root %{_datadir}/ovirt-node-recipe
@@ -93,7 +98,8 @@ however on a development machine to help to build the image.
%package tools
Summary: Recipes for building and running %{product_family} image
Group: Applications/System
-Requires: livecd-tools >= 020-2
+Requires: livecd-tools >= 1:16.0
+Requires: appliance-tools-minimizer
%define tools_root %{_datadir}/ovirt-node-tools
@@ -103,6 +109,47 @@ This package provides plugin tools for modifying and working with the
This package is not to be installed on the %{product_family},
however on a development machine to work with the image.
+%package plugin-snmp
+Summary: SNMP plugin for %{product_family} image
+Group: Applications/System
+Requires: net-snmp
+Requires: perl-libs
+
+%define snmp_root %{_datadir}/%{name}
+
+%description plugin-snmp
+This package provides an snmp plugin tools for use with%{product_family} image.
+
+%post plugin-snmp
+systemctl enable snmpd.service
+
+cat > /etc/snmp/snmpd.conf << \EOF_snmpd
+master agentx
+dontLogTCPWrappersConnects yes
+rwuser root auth .1
+EOF_snmpd
+
+%package plugin-cim
+Summary: CIM plugin for %{product_family} image
+Group: Applications/System
+Requires: libvirt-cim
+Requires: sblim-sfcb
+
+%description plugin-cim
+This package provides a cim plugin for use with%{product_family} image.
+
+%post plugin-cim
+groupadd cim
+useradd -g cim -G sfcb -s /sbin/nologin cim
+%if ! %{is_systemd}
+/sbin/chkconfig --add ovirt-cim
+%else
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%endif
+
%prep
%setup -q
@@ -120,18 +167,18 @@ make
%{__rm} -rf %{buildroot}
make install DESTDIR=%{buildroot}
-%if %is_f16
+%if %{is_f16}
# install libvirtd systemd service
%{__install} -p -m0644 libvirtd.service %{buildroot}%{_unitdir}
%endif
-%if 0%{?rhel}
+%if ! %{is_systemd}
# install libvirtd upstart job
%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/init
%{__install} -p -m0644 libvirtd.upstart %{buildroot}%{_sysconfdir}/init/libvirtd.conf
%endif
# dracut patches for rhel6
-%if 0%{?rhel}
+%if ! %{is_systemd}
%{__install} -p -m0644 dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch %{buildroot}%{app_root}
%{__install} -p -m0644 dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch %{buildroot}%{app_root}
%endif
@@ -140,6 +187,13 @@ make install DESTDIR=%{buildroot}
# specific version of python-augeas is not available in Fedora yet
%{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib}
+# Build and install the new TUI
+pushd .
+cd scripts/tui/
+make -f makefile.legacy install python=%{__python} prefix=%{_prefix} root=%{buildroot}
+# Remove some extra data
+rm -rf %{buildroot}/usr/extra
+popd .
%clean
%{__rm} -rf %{buildroot}
@@ -147,13 +201,12 @@ make install DESTDIR=%{buildroot}
%post
/sbin/chkconfig --level 35 netconsole on
-%if 0%{?rhel}
+%if ! %{is_systemd}
/sbin/chkconfig --add ovirt-awake
/sbin/chkconfig --add ovirt-early
/sbin/chkconfig --add ovirt-firstboot
/sbin/chkconfig --add ovirt
/sbin/chkconfig --add ovirt-post
-/sbin/chkconfig --add ovirt-cim
%else
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -164,7 +217,7 @@ fi
if [ ! -e /boot/grub/splash.xpm.gz ]; then
cp %{app_root}/grub-splash.xpm.gz /boot/grub/splash.xpm.gz
fi
-%if 0%{?rhel} && ! 0%{?centos}
+%if ! %{is_systemd}
# apply dracut fixes not in rhel6
# rhbz#683330
# dracut.git commits rediffed for dracut-004-53.el6
@@ -186,19 +239,17 @@ echo "%{product_family} release %{product_release}" > /etc/system-release
%preun
/sbin/chkconfig --level 35 netconsole off
-%if 0%{?rhel}
+%if ! %{is_systemd}
if [ $1 = 0 ] ; then
/sbin/service ovirt-early stop >/dev/null 2>&1
/sbin/service ovirt-firstboot stop >/dev/null 2>&1
/sbin/service ovirt stop >/dev/null 2>&1
/sbin/service ovirt-post stop >/dev/null 2>&1
- /sbin/service ovirt-cim stop >/dev/null 2>&1
/sbin/chkconfig --del ovirt-awake
/sbin/chkconfig --del ovirt-early
/sbin/chkconfig --del ovirt-firstboot
/sbin/chkconfig --del ovirt
/sbin/chkconfig --del ovirt-post
- /sbin/chkconfig --del ovirt-cim
fi
%else
if [ $1 -eq 0 ] ; then
@@ -207,15 +258,26 @@ if [ $1 -eq 0 ] ; then
/bin/systemctl --no-reload disable ovirt.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload disable ovirt-post.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload disable ovirt-early.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable ovirt-cim.service > /dev/null 2>&1 || :
/bin/systemctl stop ovirt.service > /dev/null
/bin/systemctl stop ovirt-post.service > /dev/null
/bin/systemctl stop ovirt-early.service > /dev/null
- /bin/systemctl stop ovirt-cim.service > /dev/null
fi
%endif
+%preun plugin-cim
+%if ! %{is_systemd}
+if [ $1 = 0 ] ; then
+ /sbin/service ovirt-cim stop >/dev/null 2>&1
+ /sbin/chkconfig --del ovirt-cim
+fi
+%else
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable ovirt-cim.service > /dev/null 2>&1 || :
+ /bin/systemctl stop ovirt-cim.service > /dev/null
+fi
+%endif
%files recipe
%defattr(0644,root,root,0755)
@@ -230,6 +292,19 @@ fi
%{_sbindir}/edit-node
%{_mandir}/man8/edit-node.8.gz
+%files plugin-snmp
+%{python_sitelib}/ovirt_config_setup/snmp.py
+%{_sysconfdir}/ovirt-plugins.d/snmp.minimize
+%{_sysconfdir}/ovirt-config-boot.d/snmp_autoinstall.py
+
+%files plugin-cim
+%{python_sitelib}/ovirt_config_setup/cim.py
+%{_sysconfdir}/ovirt-plugins.d/cim.minimize
+%if %{is_systemd}
+%{_unitdir}/ovirt-cim.service
+%else
+%{_initrddir}/ovirt-cim
+%endif
%files
%defattr(-,root,root)
@@ -240,12 +315,13 @@ fi
%{mgmt_scripts_dir}
%{_sysconfdir}/ovirt-config-boot.d
+%exclude %{_sysconfdir}/ovirt-config-boot.d/snmp_autoinstall.py*
%config(noreplace) %{_sysconfdir}/sysconfig/node-config
-%if %is_f16
+%if %{is_f16}
%{_unitdir}/libvirtd.service
%endif
-%if 0%{?rhel}
+%if ! %{is_systemd}
%{_sysconfdir}/init/libvirtd.conf
%endif
@@ -258,29 +334,20 @@ fi
%{app_root}/grub-splash.xpm.gz
# end i386 bits
%{app_root}/syslinux-vesa-splash.jpg
-%if 0%{?rhel}
+%if ! %{is_systemd}
%{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch
%{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
%endif
-%{_prefix}/lib/dracut/modules.d/91ovirtnode/module-setup.sh
-%{_prefix}/lib/dracut/modules.d/91ovirtnode/ovirt-boot-functions
-%{_prefix}/lib/dracut/modules.d/91ovirtnode/ovirt-cleanup.sh
+
+%{dracutdir}/91ovirtnode/module-setup.sh
+%{dracutdir}/91ovirtnode/ovirt-boot-functions
+%{dracutdir}/91ovirtnode/ovirt-cleanup.sh
%{_sysconfdir}/dracut.conf.d/ovirt-dracut.conf
%{_libexecdir}/ovirt-auto-install
-%{_libexecdir}/ovirt-config-boot
-%{_libexecdir}/ovirt-config-hostname
-%{_libexecdir}/ovirt-config-iscsi
-%{_libexecdir}/ovirt-config-kdump
-%{_libexecdir}/ovirt-config-logging
-%{_libexecdir}/ovirt-config-networking
%{_libexecdir}/ovirt-config-password
-%{_libexecdir}/ovirt-config-rhn
-%{_libexecdir}/ovirt-config-storage
%{_libexecdir}/ovirt-config-uninstall
-%{_libexecdir}/ovirt-config-view-logs
%{_libexecdir}/ovirt-functions
-%{_libexecdir}/ovirt-process-config
%{_libexecdir}/ovirt-rpmquery
%{_libexecdir}/ovirt-config-installer
%{_libexecdir}/ovirt-config-setup
@@ -289,28 +356,37 @@ fi
%{_sbindir}/persist
%{_sbindir}/unpersist
%{python_sitelib}/ovirt_config_setup
+%exclude %{python_sitelib}/ovirt_config_setup/cim.py*
+%exclude %{python_sitelib}/ovirt_config_setup/snmp.py*
%{python_sitelib}/ovirtnode
%{python_sitelib}/augeas*
%{_sysconfdir}/ovirt-early.d
%{_sysconfdir}/ovirt-commandline.d
-%if 0%{?fedora}
+%if %{is_systemd}
%{_unitdir}/ovirt.service
%{_unitdir}/ovirt-awake.service
%{_unitdir}/ovirt-firstboot.service
%{_unitdir}/ovirt-post.service
%{_unitdir}/ovirt-early.service
-%{_unitdir}/ovirt-cim.service
%else
%{_initrddir}/ovirt-awake
%{_initrddir}/ovirt-early
%{_initrddir}/ovirt-firstboot
%{_initrddir}/ovirt
%{_initrddir}/ovirt-post
-%{_initrddir}/ovirt-cim
%endif
+# Files related to the new TUI
+%{python_sitelib}/ovirt_node_molch*.egg-info
+%{python_sitelib}/ovirt/__init__.*
+%{python_sitelib}/ovirt/node/*
+%{_bindir}/ovirt-config-setup
+%{_bindir}/ovirt-node-doc
%changelog
+* Tue Feb 12 2013 Mike Burns <mburns at redhat.com> 2.6.0-1
+- Update to upstream 2.6.0 release
+
* Tue Aug 28 2012 Mike Burns <mburns at redhat.com> 2.5.0-1
- Rebase to ovirt-node 2.5.1 release upstream
diff --git a/sources b/sources
index ddac635..31db516 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eca5387a752a216a582c84ada6f9f543 ovirt-node-2.5.1.tar.gz
+feaaca7cb8decf7bc1595b67ab384d20 ovirt-node-2.6.0.tar.gz
More information about the scm-commits
mailing list