From 4591df766dea493887807938c63a437535845e2c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 22 Mar 2011 16:12:34 +0000 Subject: [PATCH] Remove the Open Nebula driver The Open Nebula driver has been unmaintained since it was first introduced. The only commits have been for tree-wide cleanups. It also has a major design flaw, in that it only knows about guests that it has created itself, which makes it of very limited use. Discussions wrt evolution of the VMWare ESX driver, concluded that it should limit itself to single-node ESX operation and not try to manage the multi-node architecture of VirtualCenter. Open Nebula is a cluster like Virtual Center, not a single node system, so the same reasoning applies. The DeltaCloud project includes an Open Nebula driver and is a much better fit architecturally, since it is explicitly targetting the distributed multihost cluster scenario. Thus this patch deletes the libvirt Open Nebula driver with the recommendation that people use DeltaCloud for managing it instead. * configure.ac: Remove probe for xmlrpc & --with-one arg * daemon/Makefile.am, daemon/libvirtd.c, src/Makefile.am: Remove ONE driver build * src/opennebula/one_client.c, src/opennebula/one_client.h, src/opennebula/one_conf.c, src/opennebula/one_conf.h, src/opennebula/one_driver.c, src/opennebula/one_driver.c: Delete files * autobuild.sh, libvirt.spec.in, mingw32-libvirt.spec.in: Remove build rules for Open Nebula * docs/drivers.html.in, docs/sitemap.html.in: Remove reference to OpenNebula * docs/drvone.html.in: Delete file --- autobuild.sh | 1 - configure.ac | 41 -- daemon/Makefile.am | 4 - daemon/libvirtd.c | 7 - docs/drivers.html.in | 1 - docs/drvone.html.in | 108 ----- docs/sitemap.html.in | 4 - include/libvirt/virterror.h | 2 +- libvirt.spec.in | 12 +- mingw32-libvirt.spec.in | 1 - po/POTFILES.in | 2 - src/Makefile.am | 29 -- src/README | 5 +- src/opennebula/one_client.c | 207 --------- src/opennebula/one_client.h | 62 --- src/opennebula/one_conf.c | 285 ------------ src/opennebula/one_conf.h | 54 --- src/opennebula/one_driver.c | 850 ------------------------------------ src/opennebula/one_driver.h | 30 -- tools/virsh.pod | 2 +- 20 files changed, 5 insertions(+), 1702 deletions(-) delete mode 100644 docs/drvone.html.in delete mode 100644 src/opennebula/one_client.c delete mode 100644 src/opennebula/one_client.h delete mode 100644 src/opennebula/one_conf.c delete mode 100644 src/opennebula/one_conf.h delete mode 100644 src/opennebula/one_driver.c delete mode 100644 src/opennebula/one_driver.h diff --git a/autobuild.sh b/autobuild.sh index 54fb273991..491f1b811a 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -81,7 +81,6 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --without-uml \ --without-vbox \ --without-openvz \ - --without-one \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/configure.ac b/configure.ac index 1a3d3b64e7..60e0df29bd 100644 --- a/configure.ac +++ b/configure.ac @@ -271,8 +271,6 @@ AC_ARG_WITH([vbox], [with_vbox=yes]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) -AC_ARG_WITH([one], - AC_HELP_STRING([--with-one], [add ONE support @<:@default=check@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], @@ -440,11 +438,6 @@ if test "$with_qemu" = "yes" ; then fi AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) -if test "$with_one" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled]) -fi -AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"]) - if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) fi @@ -725,34 +718,6 @@ fi dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG -dnl OpenNebula driver Compilation setting -dnl - -if test "$with_libvirtd" = "no" ; then - with_one=no -fi -XMLRPC_CFLAGS= -XMLRPC_LIBS= -if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then - PKG_CHECK_MODULES(XMLRPC, xmlrpc_client >= $XMLRPC_REQUIRED, - [with_one=yes], [ - if test "x$with_one" = "xcheck" ; then - with_one=no - else - AC_MSG_ERROR( - [You must install XMLRPC-C >= $XMLRPC_REQUIRED to compile libvirt ONE driver]) - fi - ]) - if test "x$with_one" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_XMLRPC], 1, - [whether One is used to broadcast server presence]) - fi -fi -AM_CONDITIONAL([HAVE_XMLRPC], [test "x$with_one" = "xyes"]) -AM_CONDITIONAL([WITH_ONE], [test "x$with_one" = "xyes"]) -AC_SUBST([XMLRPC_CFLAGS]) -AC_SUBST([XMLRPC_LIBS]) - dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec @@ -2415,7 +2380,6 @@ AC_MSG_NOTICE([ XenAPI: $with_xenapi]) AC_MSG_NOTICE([xenlight: $with_libxl]) AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ PHYP: $with_phyp]) -AC_MSG_NOTICE([ ONE: $with_one]) AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) @@ -2542,11 +2506,6 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else AC_MSG_NOTICE([ netcf: no]) fi -if test "$with_one" = "yes" ; then -AC_MSG_NOTICE([ xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS]) -else -AC_MSG_NOTICE([ xmlrpc: no]) -fi if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9e3a5574f1..0fde04c8fa 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -114,10 +114,6 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif -if WITH_ONE - libvirtd_LDADD += ../src/libvirt_driver_one.la -endif - if WITH_STORAGE_DIR libvirtd_LDADD += ../src/libvirt_driver_storage.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 78183163a5..024f56fb92 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -87,9 +87,6 @@ # ifdef WITH_UML # include "uml/uml_driver.h" # endif -# ifdef WITH_ONE -# include "opennebula/one_driver.h" -# endif # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif @@ -925,7 +922,6 @@ static struct qemud_server *qemudInitialize(void) { virDriverLoadModule("qemu"); virDriverLoadModule("lxc"); virDriverLoadModule("uml"); - virDriverLoadModule("one"); virDriverLoadModule("nwfilter"); #else # ifdef WITH_NETWORK @@ -958,9 +954,6 @@ static struct qemud_server *qemudInitialize(void) { # ifdef WITH_UML umlRegister(); # endif -# ifdef WITH_ONE - oneRegister(); -# endif #endif return server; diff --git a/docs/drivers.html.in b/docs/drivers.html.in index ecad03a60a..042887017c 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -20,7 +20,6 @@