Arjun Roy
2009-Jul-08 18:39 UTC
[Ovirt-devel] [PATCH: ovirt-identify-node replacement 0/4] ovirt node patch to replace ovirt-identify-node with matahari qmf agent
The purpose of this patch is to add support for the matahari qmf agent package (http://git.et.redhat.com/?p=matahari.git;a=summary) to the node. The following actions are taken: 1. Deprecate ovirt-identify-node and ovirt-listen-awake by removing them from the autotools scripts, the rpm spec and the node startup scripts. 2. Remove ovirt-listen-awake and ovirt-identify-node completely. 3. Add support for the matahari qmf package to the node startup scripts. Matahari is a qmf agent that handles publishing node hardware information instead of ovirt-identify-node. Unlike o-i-n, which communicated with a custom tcp server on the ovirt node, matahari publishes the data to a specified qpid broker. Since it is a qmf agent, it also supports exporting management methods to the ovirt server. For example, the current agent has methods for shutting down and rebooting a node, and physically identifying a NIC on the node. Arjun Roy (4): Removed autotools, rpm and initscript targets related to ovirt-identify-node and ovirt-listen-awake. Removed ovirt-listen-awake. Removed ovirt-identify-node. Added startup support for matahari qmf agent. Makefile.am | 2 +- configure.ac | 7 - ovirt-identify-node/.gitignore | 3 - ovirt-identify-node/AUTHOR | 1 - ovirt-identify-node/COPYING | 339 ---------------------------- ovirt-identify-node/ChangeLog | 2 - ovirt-identify-node/Makefile.am | 33 --- ovirt-identify-node/NEWS | 2 - ovirt-identify-node/README | 2 - ovirt-identify-node/comm.c | 85 ------- ovirt-identify-node/debug.c | 50 ---- ovirt-identify-node/gather.c | 319 -------------------------- ovirt-identify-node/hal_support.c | 61 ----- ovirt-identify-node/main.c | 248 -------------------- ovirt-identify-node/ovirt-identify-node.h | 139 ------------ ovirt-identify-node/protocol.c | 293 ------------------------ ovirt-listen-awake/.gitignore | 3 - ovirt-listen-awake/COPYING | 339 ---------------------------- ovirt-listen-awake/Makefile.am | 22 -- ovirt-listen-awake/ovirt-listen-awake.c | 225 ------------------ ovirt-listen-awake/ovirt-listen-awake.init | 49 ---- ovirt-node.spec.in | 15 -- scripts/ovirt | 7 +- scripts/ovirt-install-node-stateful | 4 +- scripts/ovirt-post | 12 +- scripts/ovirt-uninstall-node-stateful | 1 - 26 files changed, 10 insertions(+), 2253 deletions(-) delete mode 100644 ovirt-identify-node/.gitignore delete mode 100644 ovirt-identify-node/AUTHOR delete mode 100644 ovirt-identify-node/COPYING delete mode 100644 ovirt-identify-node/ChangeLog delete mode 100644 ovirt-identify-node/Makefile.am delete mode 100644 ovirt-identify-node/NEWS delete mode 100644 ovirt-identify-node/README delete mode 100644 ovirt-identify-node/comm.c delete mode 100644 ovirt-identify-node/debug.c delete mode 100644 ovirt-identify-node/gather.c delete mode 100644 ovirt-identify-node/hal_support.c delete mode 100644 ovirt-identify-node/main.c delete mode 100644 ovirt-identify-node/ovirt-identify-node.h delete mode 100644 ovirt-identify-node/protocol.c delete mode 100644 ovirt-listen-awake/.gitignore delete mode 100644 ovirt-listen-awake/COPYING delete mode 100644 ovirt-listen-awake/Makefile.am delete mode 100644 ovirt-listen-awake/ovirt-listen-awake.c delete mode 100644 ovirt-listen-awake/ovirt-listen-awake.init
Arjun Roy
2009-Jul-08 18:39 UTC
[Ovirt-devel] [PATCH: ovirt-identify-node replacement 1/4] Removed autotools, rpm and initscript targets related to ovirt-identify-node and ovirt-listen-awake.
--- Makefile.am | 2 +- configure.ac | 7 ------- ovirt-node.spec.in | 15 --------------- scripts/ovirt-install-node-stateful | 4 +--- scripts/ovirt-post | 12 ++---------- scripts/ovirt-uninstall-node-stateful | 1 - 6 files changed, 4 insertions(+), 37 deletions(-) diff --git a/Makefile.am b/Makefile.am index 57eceb5..9b853f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ # also available at http://www.gnu.org/copyleft/gpl.html. OVIRT_CACHE_DIR ?= $(HOME)/ovirt-cache -SUBDIRS = ovirt-identify-node ovirt-listen-awake gptsync +SUBDIRS = gptsync EXTRA_DIST = \ .gitignore \ diff --git a/configure.ac b/configure.ac index 73aa0d9..d965a82 100644 --- a/configure.ac +++ b/configure.ac @@ -3,18 +3,11 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_PROG_CC AC_CONFIG_HEADERS([config.h]) -# for ovirt-identify-node -PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0]) -PKG_CHECK_MODULES([HAL], [hal >= 0.5.8]) -PKG_CHECK_MODULES([VIRT], [libvirt >= 0.4.4]) - # If using gcc and default CFLAGS, enable some warnings. test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \ && CFLAGS="$CFLAGS -Wshadow -Wall -Werror" AC_CONFIG_FILES([Makefile - ovirt-identify-node/Makefile - ovirt-listen-awake/Makefile gptsync/Makefile ovirt-node.spec ]) diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index e5d1d51..6e4fc6c 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -161,9 +161,6 @@ cd - %{__install} -D -m0755 scripts/ovirt-uninstall-node-stateful %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/persist %{buildroot}%{_sbindir} %{__install} -p -m0755 scripts/unpersist %{buildroot}%{_sbindir} -%{__install} -p -m0755 ovirt-identify-node/ovirt-identify-node %{buildroot}%{_sbindir} -%{__install} -p -m0755 ovirt-listen-awake/ovirt-listen-awake %{buildroot}%{_sbindir} -%{__install} -Dp -m0755 ovirt-listen-awake/ovirt-listen-awake.init %{buildroot}%{_initrddir}/ovirt-listen-awake # gptsync %{__install} -p -m0755 gptsync/gptsync %{buildroot}%{_sbindir} @@ -257,12 +254,6 @@ fi %post stateful /sbin/chkconfig --add collectd -/sbin/chkconfig --add ovirt-listen-awake - -%preun stateful -if [ "$1" = 0 ] ; then - /sbin/chkconfig --del ovirt-listen-awake -fi %post selinux for selinuxvariant in %{selinux_variants}; do @@ -329,24 +320,18 @@ fi %files stateful %defattr(-,root,root,0755) -%{_sbindir}/ovirt-listen-awake %{_sbindir}/ovirt-install-node-stateful %{_sbindir}/ovirt-uninstall-node-stateful -%{_initrddir}/ovirt-listen-awake %files %defattr(-,root,root,0755) %{_sbindir}/ovirt-awake -%{_sbindir}/ovirt-identify-node %{_initrddir}/ovirt-functions %defattr(-,root,root,0644) %{_sysconfdir}/collectd.conf.in %{_sysconfdir}/chkconfig.d/collectd %config %attr(0644,root,root) %{_sysconfdir}/ovirt-release %config %attr(0644,root,root) %{_sysconfdir}/default/ovirt -%doc ovirt-identify-node/README ovirt-identify-node/NEWS -%doc ovirt-identify-node/AUTHOR ovirt-identify-node/ChangeLog -%doc ovirt-identify-node/COPYING %changelog * Thu Dec 11 2008 Perry Myers <pmyers at redhat.com> - 0.96 diff --git a/scripts/ovirt-install-node-stateful b/scripts/ovirt-install-node-stateful index 9426c81..d16b42d 100755 --- a/scripts/ovirt-install-node-stateful +++ b/scripts/ovirt-install-node-stateful @@ -69,7 +69,6 @@ backup_file /etc/hosts add_if_not_exist "192.168.50.1 $PHYS_HOST" /etc/hosts add_if_not_exist "192.168.50.2 $MGMT_HOST" /etc/hosts -chkconfig ovirt-listen-awake on chkconfig collectd on chkconfig libvirt-qpid on chkconfig iptables on @@ -89,7 +88,7 @@ backup_file /etc/sysconfig/iptables # We open up anything coming from ovirtbr0 to this node, since it # is only intended for demo purposes. For reference, here are the # ports that need to be opened: -# 7777:tcp (ovirt-listen-awake), 16509:tcp (libvirtd), 5900-6000:tcp (vnc), +# 16509:tcp (libvirtd), 5900-6000:tcp (vnc), # 49152-49216:tcp (libvirt migration) lokkit -q -t ovirtbr0 @@ -108,7 +107,6 @@ else fi service collectd restart -service ovirt-listen-awake restart service libvirt-qpid restart service ntpd stop service ntpdate start diff --git a/scripts/ovirt-post b/scripts/ovirt-post index 647b049..1fcfd6a 100755 --- a/scripts/ovirt-post +++ b/scripts/ovirt-post @@ -59,16 +59,8 @@ start() { /etc/libvirt/krb5.tab \ /etc/ssh/ssh_host*_key* - find_srv identify tcp - if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then - if [ -n "$OVIRT_BOOTIF" ]; then - ovirt-identify-node -s $SRV_HOST -p $SRV_PORT -m $OVIRT_BOOTIF - else - ovirt-identify-node -s $SRV_HOST -p $SRV_PORT - fi - else - log "skipping ovirt-identify-node, oVirt registration service not available" - fi + # Removed ovirt-identify-node since it has now + # been replaced with the matahari qmf agent. } case "$1" in diff --git a/scripts/ovirt-uninstall-node-stateful b/scripts/ovirt-uninstall-node-stateful index ea16a61..5dd03ba 100755 --- a/scripts/ovirt-uninstall-node-stateful +++ b/scripts/ovirt-uninstall-node-stateful @@ -28,7 +28,6 @@ unbackup_file() { test -f "$OVIRT_BACKUP_DIR$1" && cp -pf "$OVIRT_BACKUP_DIR$1" "$1" } -chkconfig ovirt-listen-awake off chkconfig collectd off unbackup_file /etc/sysconfig/network -- 1.6.2.5