[ovirt-node] * Wed Nov 09 2011 Mike Burns <mburns at redhat.com> 2.1-0 - Many updates for stability - TUI interface

Wed Nov 9 17:33:13 UTC 2011

commit f88c71bbd7bccd8a117c04d737101cff39330961
Author: Mike Burns <mburns at redhat.com>
Date:   Wed Nov 9 12:33:01 2011 -0500

    * Wed Nov 09 2011 Mike Burns <mburns at redhat.com> 2.1-0
    - Many updates for stability
    - TUI interface

 .gitignore                                         |    1 +
 ...-development-Fedoras-have-updates-testing.patch |   24 --------
 ovirt-node.spec                                    |   63 +++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 50 insertions(+), 40 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b65a40e..e25faf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ovirt-node-2.0.0.tar.gz
 /ovirt-node-2.0.1.tar.gz
+/ovirt-node-2.1.tar.gz
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 2660d0c..a12f668 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -6,10 +6,9 @@
 
 Summary:        The %{product_family} daemons/scripts
 Name:           ovirt-node
-Version:        2.0.1
-Release:        4%{?dist}%{?extra_release}
+Version:        2.1
+Release:        0%{?dist}%{?extra_release}
 Source0:        %{name}-%{version}.tar.gz
-Patch1:         0001-in-development-Fedoras-have-updates-testing.patch
 License:        GPLv2+
 Group:          Applications/System
 
@@ -17,14 +16,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL:            http://www.ovirt.org/
 BuildRequires:  python-setuptools
 BuildRequires:  automake autoconf
+BuildRequires:  systemd-units
 
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 %if 0%{?fedora}
-Requires:       python-augeas
+Requires:       systemd-units
+#Requires:       python-augeas
 Requires:       glusterfs-client >= 2.0.1
 Requires:       anyterm
 Requires:       python-IPy
+Requires:       grub2
 %endif
 Requires:       libvirt >= 0.9.2
 Requires:       augeas >= 0.3.5
@@ -40,7 +42,6 @@ Requires:       chkconfig
 Requires:       bind-utils
 Requires:       qemu-img
 Requires:       nc
-Requires:       grub
 Requires:       /usr/sbin/crond
 Requires:       newt-python
 Requires:       libuser-python >= 0.56.9
@@ -51,6 +52,7 @@ Requires:       ethtool
 Requires:       cracklib-python
 Requires:       dracut
 %if 0%{?rhel}
+Requires:       grub
 # for applying patches in %post
 Requires:       patch
 %endif
@@ -79,11 +81,10 @@ however on a development machine to help to build the image.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 aclocal && autoheader && automake --add-missing && autoconf
-%configure
+%configure --with-image-minimizer
 make
 
 %install
@@ -110,13 +111,24 @@ make install DESTDIR=%{buildroot}
 
 %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d
 %{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node
-# configure libvirtd upstart job
+%if 0%{?fedora}
+# install libvirtd systemd service
+%{__install} -d -m0755 %{buildroot}%{_unitdir}
+%{__install} -p -m0644 libvirtd.service %{buildroot}%{_unitdir}
+%endif
+%if 0%{?rhel}
+# install libvirtd upstart job
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/init
 %{__install} -p -m0644 libvirtd.upstart %{buildroot}%{_sysconfdir}/init/libvirtd.conf
+%endif
 # load vlan module
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/modules
 %{__install} -p -m0755 vlan.modules %{buildroot}%{_sysconfdir}/sysconfig/modules
 
+# qla4xxx iscsi hba workaround: rhbz#742433#c32
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/modprobe.d
+%{__install} -p -m0755 ovirt-qla4xxx.conf %{buildroot}%{_sysconfdir}/modprobe.d
+
 #dracut module for disk cleanup
 %{__install} -d -m0755 %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
 %{__install} -p -m0755 dracut/check %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode
@@ -160,20 +172,24 @@ echo "# File where default configuration is kept" > %{buildroot}/%{_sysconfdir}/
 %{__install} -p -m0644 scripts/install.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/iscsi.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/kdump.py %{buildroot}%{python_sitelib}/ovirtnode
-%{__install} -p -m0644 scripts/logging.py %{buildroot}%{python_sitelib}/ovirtnode
+%{__install} -p -m0644 scripts/log.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/ovirtfunctions.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/network.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0755 scripts/ovirt-config-installer.py %{buildroot}%{_libexecdir}/ovirt-config-installer
 %{__install} -p -m0755 scripts/ovirt-config-setup.py %{buildroot}%{_libexecdir}/ovirt-config-setup
 %{__install} -p -m0755 scripts/ovirt-admin-shell %{buildroot}%{_libexecdir}
-%if 0%{?rhel}
+#%if 0%{?rhel}
 # python-augeas is not in RHEL-6
+# specific version of python-augeas is not available in Fedora yet
 %{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib}
-%endif
+#%endif
 
 # ovirt-early vendor hook dir
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-early.d
 
+# ovirt-early vendor commandline variables
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-commandline.d
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -196,8 +212,15 @@ patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-3d88d27810acc7782618d67a03f
 patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
 %endif
 #use all hard-coded defaults for multipath
-> /etc/multipath.conf
+# except for getuid_callout where we need replace-whitespace
+cat > /etc/multipath.conf << \EOF_multipath_conf
+defaults {
+    getuid_callout "/lib/udev/scsi_id --replace-whitespace --whitelisted --device=/dev/%n"
+}
+EOF_multipath_conf
 #release info for dracut to pick it up into initramfs
+# remove symlink to keep original redhat-release
+rm -f /etc/system-release
 echo "%{product_family} release %{product_release}" > /etc/system-release
 
 %preun
@@ -233,9 +256,15 @@ fi
 %{_sysconfdir}/ovirt-config-boot.d
 %config(noreplace) %{_sysconfdir}/sysconfig/node-config
 
+%if 0%{?fedora}
+%{_unitdir}/libvirtd.service
+%endif
+%if 0%{?rhel}
 %{_sysconfdir}/init/libvirtd.conf
+%endif
 
 %{_sysconfdir}/sysconfig/modules/vlan.modules
+%{_sysconfdir}/modprobe.d/ovirt-qla4xxx.conf
 
 %doc COPYING
 # should be ifarch i386
@@ -256,7 +285,6 @@ fi
 %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-cleanup.sh
 %{_sysconfdir}/dracut.conf.d/ovirt-dracut.conf
 %{_libexecdir}/ovirt-config-boot
-%{_libexecdir}/ovirt-config-boot-wrapper
 %{_libexecdir}/ovirt-config-hostname
 %{_libexecdir}/ovirt-config-iscsi
 %{_libexecdir}/ovirt-config-kdump
@@ -279,9 +307,9 @@ fi
 %{_sbindir}/unpersist
 %{python_sitelib}/ovirt_config_setup
 %{python_sitelib}/ovirtnode
-%if 0%{?rhel}
+#%if 0%{?rhel}
 %{python_sitelib}/augeas*
-%endif
+#%endif
 
 %{_initrddir}/ovirt-awake
 %{_initrddir}/ovirt-early
@@ -289,8 +317,13 @@ fi
 %{_initrddir}/ovirt
 %{_initrddir}/ovirt-post
 %{_sysconfdir}/ovirt-early.d
+%{_sysconfdir}/ovirt-commandline.d
 
 %changelog
+* Wed Nov 09 2011 Mike Burns <mburns at redhat.com> 2.1-0
+- Many updates for stability
+- TUI interface
+
 * Thu Aug 04 2011 Alan Pevec <apevec at redhat.com> 2.0.1-4
 - remove obsolete libvirt-qpid dependency
 - in development Fedoras have updates-testing
diff --git a/sources b/sources
index b51d87e..a1a61e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80ef8a7d253fca2cc2d206db2f523ccd  ovirt-node-2.0.1.tar.gz
+96255cea04950bfe24633831287e8811  ovirt-node-2.1.tar.gz
