change dir structure

5 files changed, 0 insertions, 243 deletions

diff --git a/os-plugins/plugins/openvz/OpenSLX/OSPlugin/openvz.pm b/os-plugins/plugins/openvz/OpenSLX/OSPlugin/openvz.pm
deleted file mode 100644
index 35e12bb2..00000000
--- a/os-plugins/plugins/openvz/OpenSLX/OSPlugin/openvz.pm
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright (c) 2010 - RZ Uni Freiburg
-# Copyright (c) 2010 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your suggestions, praise, or complaints to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org/
-# -----------------------------------------------------------------------------
-# openvz.pm
-#    - implementation of the 'openvz' plugin
-# -----------------------------------------------------------------------------
-package OpenSLX::OSPlugin::openvz;
-
-use strict;
-use warnings;
-
-use base qw(OpenSLX::OSPlugin::Base);
-
-use File::Path;
-
-use OpenSLX::Basics;
-use OpenSLX::Utils;
-
-sub new
-{
-    my $class = shift;
-
-    my $self = {
-        name => 'openvz',
-    };
-
-    return bless $self, $class;
-}
-
-sub getInfo
-{
-    my $self = shift;
-
-    return {
-        description => unshiftHereDoc(<<'        End-of-Here'),
-            Configures openVZ diskless boot, no installation yet.
-        End-of-Here
-        precedence => 20,
-    };
-}
-
-sub getAttrInfo
-{
-    my $self = shift;
-
-    return {
-        'openvz::active' => {
-            applies_to_systems => 1,
-            applies_to_clients => 1,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                should the 'openvz'-plugin be executed during boot?
-            End-of-Here
-            content_regex => qr{^(0|1)$},
-            content_descr => '1 means active - 0 means inactive',
-            # set active to 0, later set specially created openVZ system to 1
-            default => '0',
-        },
-        # attribute 'imagesrc' defines where we can find openvz images
-        'openvz::imagesrc' => {
-            applies_to_systems => 1,
-            applies_to_clients => 1,
-            description => unshiftHereDoc(<<'            End-of-Here'),
-                Where do we store our openvz images? NFS? Filesystem?
-            End-of-Here
-            content_regex => qr{^(/|nfs://)},
-            content_descr => 'local path or URI or "-" (unset)',
-            default => undef,
-        },
-    };
-}
-
-sub installationPhase
-{
-    my $self = shift;
-    my $info = shift;
-
-    $self->{pluginRepositoryPath} = $info->{'plugin-repo-path'};
-    $self->{openslxBasePath}      = $info->{'openslx-base-path'};
-
-    # Copy run-virt.include and template files to the appropriate place for
-    # inclusion in stage4
-    my $pluginName = $self->{'name'};
-    my $pluginBasePath = 
-      "$self->{openslxBasePath}/lib/plugins/$pluginName/files";
-
-    foreach my $file ( qw( run-virt.include machine.include ) ) {
-        copyFile("$pluginBasePath/$file", "$self->{pluginRepositoryPath}/");
-        chmod 0644, "$self->{pluginRepositoryPath}/$file";
-    }
-
-    return;
-}
-
-sub removalPhase
-{
-    my $self = shift;
-    my $info = shift;
-
-    return;
-}
-
-1;
diff --git a/os-plugins/plugins/openvz/XX_openvz.sh b/os-plugins/plugins/openvz/XX_openvz.sh
deleted file mode 100644
index 721c76a4..00000000
--- a/os-plugins/plugins/openvz/XX_openvz.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2010 - RZ Uni Freiburg
-# Copyright (c) 2010 - OpenSLX GmbH
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org
-#
-# stage3 part of 'openvz' plugin - the runlevel script
-#
-# script is included from init via the "." load function - thus it has all
-# variables and functions available
-
-# include default directories
-. /etc/openslx.conf
-
-CONFFILE=/initramfs/plugin-conf/openvz.conf
-PLUGINCONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}/plugins/openvz
-PLUGINDIR=/mnt/${OPENSLX_DEFAULT_DIR}/plugin-repo/openvz
-VIRTDIR=/mnt/${OPENSLX_DEFAULT_VIRTDIR}/openvz
-
-# check if the configuration file is available
-if [ -e ${CONFFILE} ]; then
-
-  # load needed variables
-  . ${CONFFILE}
-
-  # Test if this plugin is activated... more or less useless with the
-  # new plugin system
-  if [ $openvz_active -ne 0 2>/dev/null ]; then
-
-    [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'openvz' os-plugin ...";
-
-    # load general configuration
-    . /etc/initramfs-setup
-
-      # get source of openvz image server (get type, server and path)
-    if strinstr "/" "${openvz_imagesrc}" ; then
-      vbimgprot=$(uri_token ${openvz_imagesrc} prot)
-      vbimgserv=$(uri_token ${openvz_imagesrc} server)
-      vbimgpath="$(uri_token ${openvz_imagesrc} path)"
-    fi
-    if [ -n "${vbimgserv}" ] ; then
-      # directory where qemu images are expected in
-      mnttarget=${VIRTDIR}
-      # mount the openvz image source readonly (ro)
-      fsmount ${vbimgprot} ${vbimgserv} ${vbimgpath} ${mnttarget} ro
-    else
-      [ $DEBUGLEVEL -gt 1 ] && \
-        error "  * Incomplete information in variable ${openvz_imagesrc}." \
-        nonfatal
-    fi
-
-    # copy virtualization include files to config dir
-    testmkd ${PLUGINCONFDIR}
-    cp ${PLUGINDIR}/*.include ${PLUGINCONFDIR}
-    # copy ${CONFFILE} to ${PLUGINCONFDIR} just in case
-    cp ${CONFFILE} ${PLUGINCONFDIR}
-
-    # activate init files
-
-  fi
-fi
diff --git a/os-plugins/plugins/openvz/files/machine.include b/os-plugins/plugins/openvz/files/machine.include
deleted file mode 100644
index e69de29b..00000000
--- a/os-plugins/plugins/openvz/files/machine.include
+++ /dev/null
diff --git a/os-plugins/plugins/openvz/files/run-virt.include b/os-plugins/plugins/openvz/files/run-virt.include
deleted file mode 100644
index 53c982c8..00000000
--- a/os-plugins/plugins/openvz/files/run-virt.include
+++ /dev/null
@@ -1,37 +0,0 @@
-# run-virt.include
-# -----------------------------------------------------------------------------
-# Copyright (c) 2010 - RZ Uni Freiburg
-# Copyright (c) 2010 - OpenSLX GmbH
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org
-# -----------------------------------------------------------------------------
-# run-virt.include
-#    - Include script for running openVZ on an OpenSLX client via run-virt.sh or
-#      run-vmgrid.sh
-################################################################################
-
-################################################################################
-### Include general configuration
-################################################################################
-if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/${self}/${self}.conf ]; then
-  . ${OPENSLX_DEFAULT_CONFDIR}/plugins/${self}/${self}.conf
-else
-  writelog "Problems reading config file of ${self} plugin"
-  exit 1
-fi
-
-################################################################################
-### Declaration of default variables
-################################################################################
-
-PLUGINCONFXEN="${PLUGINCONFROOT}/${self}"
-# create TMPDIR for all users
-mkdir -m 1777 /tmp/${self} 2>/dev/null
-# dir for configs
-confdir="/tmp/${self}/${USER}/${VM_ID}"
diff --git a/os-plugins/plugins/openvz/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/openvz/init-hooks/20-nw-bridge-config/bridge.sh
deleted file mode 100755
index d5245234..00000000
--- a/os-plugins/plugins/openvz/init-hooks/20-nw-bridge-config/bridge.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2009 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org
-#
-# Init hook to create a bridge on the active network interface
-# (should be kept identical to the files of virtualbox and qemukvm plugins)
-#############################################################################
-
-local bridge=br0
-local brnwif=${nwif}
-local nwifmac=${macaddr}
-
-# bridge 0 already defined or some other problem
-brctl addbr ${bridge} || exit 0
-brctl stp ${bridge} 0
-brctl setfd ${bridge} 0.000000000001
-ip link set addr ${nwifmac} ${bridge}
-ip link set dev ${nwif} up
-brctl addif ${bridge} ${nwif}
-
-# fixme: sending back the variable to init does not work properly at the
-# moment
-nwif=${bridge}