From eb318302b6957abc774e7340786251fff80f4ab0 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 14 May 2014 16:29:48 +0200 Subject: [PATCH] merged the 3 packaging-dependant tracks (-lib, -lxc and -vs) into a single specfile, single setup script and single Makefile this is useful in its own, plus hopefully this will make ubuntu packaging much easier, --- Makefile | 32 +--- nodemanager-lxc.spec | 184 ---------------------- nodemanager-vs.spec | 186 ----------------------- nodemanager-lib.spec => nodemanager.spec | 113 +++++++++++++- setup-lxc.py | 23 --- setup-vs.py | 23 --- setup-lib.py => setup.py | 10 ++ 7 files changed, 124 insertions(+), 447 deletions(-) delete mode 100644 nodemanager-lxc.spec delete mode 100644 nodemanager-vs.spec rename nodemanager-lib.spec => nodemanager.spec (86%) delete mode 100644 setup-lxc.py delete mode 100644 setup-vs.py rename setup-lib.py => setup.py (83%) diff --git a/Makefile b/Makefile index 5648041..0bea07a 100644 --- a/Makefile +++ b/Makefile @@ -14,22 +14,16 @@ initdir=/etc/rc.d/init.d systemddir := /usr/lib/systemd/system #################### -lib: forward_api_calls - python setup-lib.py build - -vs: - python setup-vs.py build - -lxc: - python setup-lxc.py build +all: forward_api_calls + python setup.py build forward_api_calls: forward_api_calls.c $(CC) -Wall -Os -o $@ $? strip $@ #################### install -install-lib: install-miscell install-startup - python setup-lib.py install \ +install: install-miscell install-startup + python setup.py install \ --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \ --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \ --install-scripts=$(DESTDIR)/$(bindir) @@ -67,25 +61,9 @@ install-systemd: mkdir -p $(DESTDIR)/$(systemddir) rsync -av systemd/ $(DESTDIR)/$(systemddir) -install-vs: - python setup-vs.py install \ - --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \ - --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \ - --install-scripts=$(DESTDIR)/$(bindir) - install -m 444 README $(DESTDIR)/$(datadir)/NodeManager - -install-lxc: - python setup-lxc.py install \ - --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \ - --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \ - --install-scripts=$(DESTDIR)/$(bindir) - install -m 444 README $(DESTDIR)/$(datadir)/NodeManager - #################### clean clean: - python setup-lib.py clean - python setup-vs.py clean - python setup-lxc.py clean + python setup.py clean rm -f forward_api_calls *.pyc build .PHONY: all install clean diff --git a/nodemanager-lxc.spec b/nodemanager-lxc.spec deleted file mode 100644 index b6b6ed2..0000000 --- a/nodemanager-lxc.spec +++ /dev/null @@ -1,184 +0,0 @@ -# we define this in a separate specfile because we cannot produce all the 3 packages -# nodemanager-lib nodemanager-vs nodemanager-lxc in a single build - -%define slicefamily %{pldistro}-%{distroname}-%{_arch} - -%define name nodemanager-lxc -%define version 5.2 -%define taglevel 12 - -%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} - -Summary: PlanetLab Node Manager Plugin for lxc nodes -Name: %{name} -Version: %{version} -Release: %{release} -License: PlanetLab -Group: System Environment/Daemons -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab %{plrelease} -URL: %{SCMURL} - -# for nodeupdate -Provides: nodemanager - -# we use libvirt -Requires: libvirt -Requires: libvirt-python -# cgroups.py needs this -Requires: python-inotify -# the common package for nodemanager -Requires: nodemanager-lib = %{version} -# the lxc-specific tools for using slice images -Requires: lxc-sliceimage -Requires: openvswitch -# Requires: sliceimage-lxc-f16-x86_64 >= 5.1-3 - -%description -nodemanager-lxc provides the lxc code for the PlanetLab Node Manager. - -%prep -%setup -q - -%build -# make manages the C and Python stuff -%{__make} %{?_smp_mflags} lxc - -%install -# make manages the C and Python stuff -rm -rf $RPM_BUILD_ROOT -%{__make} %{?_smp_mflags} install-lxc DESTDIR="$RPM_BUILD_ROOT" - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_datadir}/NodeManager/ - -%changelog -* Fri Apr 04 2014 Thierry Parmentelat - nodemanager-5.2-12 -- this tag for the first time passes the full range of tests on fedora20 -- robustified slice teardown wrt vsys -- Scott's fix for repairing veth devs -- removed sshsh -- tools.has_systemctl - -* Tue Mar 25 2014 Thierry Parmentelat - nodemanager-5.2-11 -- ship /etc/sysconfig/nodemanager -- trash sshsh - -* Fri Mar 21 2014 Thierry Parmentelat - nodemanager-5.2-10 -- comes with systemd native unit files on >= f18 -- user-provided initscript gets started through systemd in slivers >= f18 -- smarter to locate cgroups for various versions of libvirt -- nicer log format - and log program termination -- tweaks in codemux plugin -- bug fixes in libvirt driver, esp. for finding out if domain is running - -* Wed Dec 11 2013 Thierry Parmentelat - nodemanager-5.2-9 -- fixes in hostmap, and in interfaces -- new vsys_sysctl -- privatebridge now comes with nodemanager-lib - -* Fri Sep 20 2013 Thierry Parmentelat - nodemanager-5.2-8 -- omf plugin does not block any longer when running trigger script -- log goes into sliver's /var/log instead - -* Wed Aug 28 2013 Thierry Parmentelat - nodemanager-5.2-7 -- new install-scripts target in Makefile -- conf_files and fuse-pl initscripts chmod'ed +x -- omf_resctl config template tweaked to use _slicename_%_hostname_ - -* Sun Jul 14 2013 Thierry Parmentelat - nodemanager-5.2-6 -- make sure to create /etc/planetlab/virt so others can read that -- expose get_node_virt() and command_in_slice() -- refined omf_resctl plugin (fetches trigger, and calls it on expire change) -- user's .profile now has right owner -- other tweaks in lxc slivers - -* Wed Jul 03 2013 Thierry Parmentelat - nodemanager-5.2-5 -- lxc slice creation: slice user was created with unknown gid - fixed -- lxc slice creation: .profile for root and user - fixed - -* Sat Jun 29 2013 Thierry Parmentelat - nodemanager-5.2-4 -- fix umounting of ssh directory when deleting omf-friendly slivers -- support for writing cgroups in subsystems other than cpuset -- add xid to template match -- finer-grained split between -lib -vs and -lxc -- first roughly complete omf_resctl for omfv6 -- minor fix for when getslivers does not have minexemptrate - -* Fri May 24 2013 Andy Bavier - nodemanager-5.2-3 -- Fix path, machine arch in slivers - -* Tue Apr 30 2013 Stephen Soltesz - nodemanager-5.2-2 - -* Thu Mar 07 2013 Thierry Parmentelat - nodemanager-5.2-1 -- no-op bump to 5.2 to be in line with the rest of the system - -* Thu Feb 21 2013 Thierry Parmentelat - nodemanager-2.1-22 -- improvements to privatebridge - -* Sat Jan 19 2013 Scott Baker - nodemanager-2.1-21 -- change hostnames related to private IPs to use pvt.hostname instead of slice_name.hostname - -* Mon Jan 14 2013 Scott Baker - nodemanager-2.1-20 -- fix wrong gre tunnel deleted when topology changes - -* Mon Jan 14 2013 Scott Baker - nodemanager-2.1-19 -- Update /etc/hosts in slivers from sliver_hostmap tag. - -* Mon Jan 07 2013 Scott Baker - nodemanager-2.1-18 -- Support passing a list of interfaces in slice interface tag to configure multiple interfaces, -- initial check-in of privatebridge plugin. - -* Fri Dec 14 2012 Scott Baker - nodemanager-2.1-17 -- set ownership of slice homedir, att slice user to etc/sudoers inside of slice - -* Wed Dec 12 2012 Scott Baker - nodemanager-2.1-16 -- fix slices not deleted properly when they use vsys - -* Mon Dec 10 2012 Scott Baker - nodemanager-2.1-15 -- fix error in syndicate plugin, add error message to nodemanager for attributeerror during load/start - -* Mon Dec 10 2012 Scott Baker - nodemanager-2.1-14 -- Add syndicate plugin, create /etc/hostname and home directory in LXC guests - -* Tue Nov 13 2012 Andy Bavier - nodemanager-2.1-13 -- Bridge virtual interfaces to VLANs - -* Wed Oct 24 2012 Andy Bavier - nodemanager-2.1-12 -- Add support for L2 bridged interfaces with public IPs inside a slice - -* Thu Oct 18 2012 Scott Baker - nodemanager-2.1-11 -- Support for freezing BestEffort slices for Vicci - -* Wed Sep 05 2012 Andy Bavier - nodemanager-2.1-10 -- Change to use new vsh (wrapper for lxcsu) - -* Fri Aug 31 2012 Thierry Parmentelat - nodemanager-2.1-9 -- add missing import -- 2.1-8 is less broken than 2.1-7 for omf-friendly slices, in that the slivers would get created, but the OMF-feature probably won't work as .ssh won't get exposed to the sliver - -* Thu Aug 30 2012 Thierry Parmentelat - nodemanager-2.1-8 -- tag 2.1-7 was broken for OMF-friendly slices -- expose_ssh_dir was erroneously defined on the Worker class - -* Thu Jul 19 2012 Thierry Parmentelat - nodemanager-2.1-7 -- bwlimitlxc now ships with plnode-utils - -* Mon Jul 09 2012 Thierry Parmentelat - nodemanager-2.1-6 -- set LD_PRELOAD for linux-containers nodes - -* Thu Jun 28 2012 Thierry Parmentelat - nodemanager-2.1-5 -- first complete version for vs and lxc - functional but not thoroughly tested though - -* Tue Jun 26 2012 Thierry Parmentelat - nodemanager-2.1-4 -- split packaging in 3 (lib, lxc, vs) -- this tag will only work with lxc though - diff --git a/nodemanager-vs.spec b/nodemanager-vs.spec deleted file mode 100644 index 59ecb2d..0000000 --- a/nodemanager-vs.spec +++ /dev/null @@ -1,186 +0,0 @@ -# we define this in a separate specfile because we cannot produce all the 3 packages -# nodemanager-lib nodemanager-vs nodemanager-lxc in a single build - -%define slicefamily %{pldistro}-%{distroname}-%{_arch} - -%define name nodemanager-vs -%define version 5.2 -%define taglevel 12 - -%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} - -Summary: PlanetLab Node Manager Plugin for vserver nodes -Name: %{name} -Version: %{version} -Release: %{release} -License: PlanetLab -Group: System Environment/Daemons -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab %{plrelease} -URL: %{SCMURL} - -# old name, when all came as a single package with vserver wired in -Obsoletes: NodeManager -# for nodeupdate -Provides: nodemanager - -# our interface to the vserver patch -Requires: util-vserver >= 0.30.208-17 -# and the planetlab utilities -Requires: util-vserver-python > 0.3-16 -# the common package for nodemanager -Requires: nodemanager-lib = %{version} -# the vserver-specific tools for using slice images -Requires: vserver-sliceimage - -%description -nodemanager-vs provides the vserver code for the PlanetLab Node Manager. - -%prep -%setup -q - -%build -# make manages the C and Python stuff -%{__make} %{?_smp_mflags} vs - -%install -# make manages the C and Python stuff -rm -rf $RPM_BUILD_ROOT -%{__make} %{?_smp_mflags} install-vs DESTDIR="$RPM_BUILD_ROOT" - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%{_datadir}/NodeManager/ - -%changelog -* Fri Apr 04 2014 Thierry Parmentelat - nodemanager-5.2-12 -- this tag for the first time passes the full range of tests on fedora20 -- robustified slice teardown wrt vsys -- Scott's fix for repairing veth devs -- removed sshsh -- tools.has_systemctl - -* Tue Mar 25 2014 Thierry Parmentelat - nodemanager-5.2-11 -- ship /etc/sysconfig/nodemanager -- trash sshsh - -* Fri Mar 21 2014 Thierry Parmentelat - nodemanager-5.2-10 -- comes with systemd native unit files on >= f18 -- user-provided initscript gets started through systemd in slivers >= f18 -- smarter to locate cgroups for various versions of libvirt -- nicer log format - and log program termination -- tweaks in codemux plugin -- bug fixes in libvirt driver, esp. for finding out if domain is running - -* Wed Dec 11 2013 Thierry Parmentelat - nodemanager-5.2-9 -- fixes in hostmap, and in interfaces -- new vsys_sysctl -- privatebridge now comes with nodemanager-lib - -* Fri Sep 20 2013 Thierry Parmentelat - nodemanager-5.2-8 -- omf plugin does not block any longer when running trigger script -- log goes into sliver's /var/log instead - -* Wed Aug 28 2013 Thierry Parmentelat - nodemanager-5.2-7 -- new install-scripts target in Makefile -- conf_files and fuse-pl initscripts chmod'ed +x -- omf_resctl config template tweaked to use _slicename_%_hostname_ - -* Sun Jul 14 2013 Thierry Parmentelat - nodemanager-5.2-6 -- make sure to create /etc/planetlab/virt so others can read that -- expose get_node_virt() and command_in_slice() -- refined omf_resctl plugin (fetches trigger, and calls it on expire change) -- user's .profile now has right owner -- other tweaks in lxc slivers - -* Wed Jul 03 2013 Thierry Parmentelat - nodemanager-5.2-5 -- lxc slice creation: slice user was created with unknown gid - fixed -- lxc slice creation: .profile for root and user - fixed - -* Sat Jun 29 2013 Thierry Parmentelat - nodemanager-5.2-4 -- fix umounting of ssh directory when deleting omf-friendly slivers -- support for writing cgroups in subsystems other than cpuset -- add xid to template match -- finer-grained split between -lib -vs and -lxc -- first roughly complete omf_resctl for omfv6 -- minor fix for when getslivers does not have minexemptrate - -* Fri May 24 2013 Andy Bavier - nodemanager-5.2-3 -- Fix path, machine arch in slivers - -* Tue Apr 30 2013 Stephen Soltesz - nodemanager-5.2-2 - -* Thu Mar 07 2013 Thierry Parmentelat - nodemanager-5.2-1 -- no-op bump to 5.2 to be in line with the rest of the system - -* Thu Feb 21 2013 Thierry Parmentelat - nodemanager-2.1-22 -- improvements to privatebridge - -* Sat Jan 19 2013 Scott Baker - nodemanager-2.1-21 -- change hostnames related to private IPs to use pvt.hostname instead of slice_name.hostname - -* Mon Jan 14 2013 Scott Baker - nodemanager-2.1-20 -- fix wrong gre tunnel deleted when topology changes - -* Mon Jan 14 2013 Scott Baker - nodemanager-2.1-19 -- Update /etc/hosts in slivers from sliver_hostmap tag. - -* Mon Jan 07 2013 Scott Baker - nodemanager-2.1-18 -- Support passing a list of interfaces in slice interface tag to configure multiple interfaces, -- initial check-in of privatebridge plugin. - -* Fri Dec 14 2012 Scott Baker - nodemanager-2.1-17 -- set ownership of slice homedir, att slice user to etc/sudoers inside of slice - -* Wed Dec 12 2012 Scott Baker - nodemanager-2.1-16 -- fix slices not deleted properly when they use vsys - -* Mon Dec 10 2012 Scott Baker - nodemanager-2.1-15 -- fix error in syndicate plugin, add error message to nodemanager for attributeerror during load/start - -* Mon Dec 10 2012 Scott Baker - nodemanager-2.1-14 -- Add syndicate plugin, create /etc/hostname and home directory in LXC guests - -* Tue Nov 13 2012 Andy Bavier - nodemanager-2.1-13 -- Bridge virtual interfaces to VLANs - -* Wed Oct 24 2012 Andy Bavier - nodemanager-2.1-12 -- Add support for L2 bridged interfaces with public IPs inside a slice - -* Thu Oct 18 2012 Scott Baker - nodemanager-2.1-11 -- Support for freezing BestEffort slices for Vicci - -* Wed Sep 05 2012 Andy Bavier - nodemanager-2.1-10 -- Change to use new vsh (wrapper for lxcsu) - -* Fri Aug 31 2012 Thierry Parmentelat - nodemanager-2.1-9 -- add missing import -- 2.1-8 is less broken than 2.1-7 for omf-friendly slices, in that the slivers would get created, but the OMF-feature probably won't work as .ssh won't get exposed to the sliver - -* Thu Aug 30 2012 Thierry Parmentelat - nodemanager-2.1-8 -- tag 2.1-7 was broken for OMF-friendly slices -- expose_ssh_dir was erroneously defined on the Worker class - -* Thu Jul 19 2012 Thierry Parmentelat - nodemanager-2.1-7 -- bwlimitlxc now ships with plnode-utils - -* Mon Jul 09 2012 Thierry Parmentelat - nodemanager-2.1-6 -- set LD_PRELOAD for linux-containers nodes - -* Thu Jun 28 2012 Thierry Parmentelat - nodemanager-2.1-5 -- first complete version for vs and lxc - functional but not thoroughly tested though - -* Tue Jun 26 2012 Thierry Parmentelat - nodemanager-2.1-4 -- split packaging in 3 (lib, lxc, vs) -- this tag will only work with lxc though - -* Tue Jun 26 2012 Thierry Parmentelat - nodemanager-2.0-38 -- split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib - diff --git a/nodemanager-lib.spec b/nodemanager.spec similarity index 86% rename from nodemanager-lib.spec rename to nodemanager.spec index bc2a9bd..ac6a08c 100644 --- a/nodemanager-lib.spec +++ b/nodemanager.spec @@ -6,15 +6,25 @@ %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -########## use initscripts or systemd unit files to start installed services +############################## +# for now we just extract all the files but package them only for either vs or lxc +# so bottom line is we have missing files at the end +# plan is to separate these target-dependant files in subdirs at some point +%define _unpackaged_files_terminate_build 0 + +############################## +# use initscripts or systemd unit files to start installed services %if "%{distro}" == "Fedora" && "%{distrorelease}" >= "18" %define make_options WITH_SYSTEMD=true %define initdir /usr/lib/systemd/system +%define build_lxc 1 %else %define make_options WITH_INIT=true %define initdir %{_initrddir} +%define build_vs 1 %endif +############################## Summary: PlanetLab Node Manager Library Name: %{name} Version: %{version} @@ -65,12 +75,12 @@ either nodemanager-vs or nodemanager-lxc %build # make manages the C and Python stuff -%{__make} %{?_smp_mflags} %{make_options} lib +%{__make} %{?_smp_mflags} %{make_options} %install # make manages the C and Python stuff rm -rf $RPM_BUILD_ROOT -%{__make} %{?_smp_mflags} %{make_options} install-lib DESTDIR="$RPM_BUILD_ROOT" +%{__make} %{?_smp_mflags} %{make_options} install DESTDIR="$RPM_BUILD_ROOT" ############################## %post @@ -130,15 +140,110 @@ fi %clean rm -rf $RPM_BUILD_ROOT +############################## %files %defattr(-,root,root,-) -%{_datadir}/NodeManager/ +%{_datadir}/NodeManager/account.* +%{_datadir}/NodeManager/api.* +%{_datadir}/NodeManager/api_calls.* +%{_datadir}/NodeManager/bwmon.* +%{_datadir}/NodeManager/conf_files.* +%{_datadir}/NodeManager/config.* +%{_datadir}/NodeManager/controller.* +%{_datadir}/NodeManager/curlwrapper.* +%{_datadir}/NodeManager/database.* +%{_datadir}/NodeManager/initscript.* +%{_datadir}/NodeManager/iptables.* +%{_datadir}/NodeManager/logger.* +%{_datadir}/NodeManager/net.* +%{_datadir}/NodeManager/nodemanager.* +%{_datadir}/NodeManager/plcapi.* +%{_datadir}/NodeManager/safexmlrpc.* +%{_datadir}/NodeManager/slivermanager.* +%{_datadir}/NodeManager/ticket.* +%{_datadir}/NodeManager/tools.* +%{_datadir}/NodeManager/plugins/codemux.* +%{_datadir}/NodeManager/plugins/hostmap.* +%{_datadir}/NodeManager/plugins/interfaces.* +%{_datadir}/NodeManager/plugins/omf_resctl.* +%{_datadir}/NodeManager/plugins/privatebridge.* +%{_datadir}/NodeManager/plugins/rawdisk.* +%{_datadir}/NodeManager/plugins/reservation.* +%{_datadir}/NodeManager/plugins/sfagids.* +%{_datadir}/NodeManager/plugins/sliverauth.* +%{_datadir}/NodeManager/plugins/specialaccounts.* +%{_datadir}/NodeManager/plugins/syndicate.* +%{_datadir}/NodeManager/plugins/vsys.* +%{_datadir}/NodeManager/plugins/vsys_privs.* %{_bindir}/forward_api_calls %{initdir}/ %{_sysconfdir}/logrotate.d/nodemanager /var/lib/nodemanager/ %config(noreplace) /etc/sysconfig/nodemanager +############################## +%if "%{build_lxc}" == "1" + +%package -n nodemanager-lxc +Summary: PlanetLab Node Manager Plugin for lxc nodes +Group: System Environment/Daemons +# we use libvirt +Requires: libvirt +Requires: libvirt-python +# cgroups.py needs this +Requires: python-inotify +# the common package for nodemanager +Requires: nodemanager-lib = %{version} +# the lxc-specific tools for using slice images +Requires: lxc-sliceimage +Requires: openvswitch + +%description -n nodemanager-lxc +nodemanager-lxc provides the lxc code for the PlanetLab Node Manager. + +%files -n nodemanager-lxc +%{_datadir}/NodeManager/sliver_libvirt.* +%{_datadir}/NodeManager/sliver_lxc.* +%{_datadir}/NodeManager/cgroups.* +%{_datadir}/NodeManager/coresched_lxc.* + +%endif +############################## + +############################## +%if "%{build_vs}" == "1" + +%package -n nodemanager-vs +Summary: PlanetLab Node Manager Plugin for vserver nodes +Group: System Environment/Daemons + +# old name, when all came as a single package with vserver wired in +Obsoletes: NodeManager +# for nodeupdate +Provides: nodemanager + +# our interface to the vserver patch +Requires: util-vserver >= 0.30.208-17 +# and the planetlab utilities +Requires: util-vserver-python > 0.3-16 +# the common package for nodemanager +Requires: nodemanager-lib = %{version} +# the vserver-specific tools for using slice images +Requires: vserver-sliceimage + +%description -n nodemanager-vs +nodemanager-vs provides the vserver code for the PlanetLab Node Manager. + +%files -n nodemanager-vs +%{_datadir}/NodeManager/sliver_vs.* +%{_datadir}/NodeManager/coresched_vs.* +# this plugin uses vserver for now +%{_datadir}/NodeManager/plugins.drl.* + +%endif +############################## + +############################## %changelog * Fri Apr 04 2014 Thierry Parmentelat - nodemanager-5.2-12 - this tag for the first time passes the full range of tests on fedora20 diff --git a/setup-lxc.py b/setup-lxc.py deleted file mode 100644 index 14954d2..0000000 --- a/setup-lxc.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python -# -# Setup script for the Node Manager application -# -# Mark Huang -# Copyright (C) 2006 The Trustees of Princeton University -# - -from distutils.core import setup, Extension - -setup( - py_modules=[ - 'sliver_libvirt', - 'sliver_lxc', - 'cgroups', - 'coresched_lxc', -# 'plugins.privatebridge', - ], - scripts = [ - ], - packages =[ - ], - ) diff --git a/setup-vs.py b/setup-vs.py deleted file mode 100644 index b9b030d..0000000 --- a/setup-vs.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python -# -# Setup script for the Node Manager application -# -# Mark Huang -# Copyright (C) 2006 The Trustees of Princeton University -# - -from distutils.core import setup, Extension - -# vserver-specific stuff -setup( - py_modules=[ - 'sliver_vs', - 'coresched_vs', - # this plugin uses vserver for now - 'plugins.drl', - ], - scripts = [ - ], - packages =[ - ], - ) diff --git a/setup-lib.py b/setup.py similarity index 83% rename from setup-lib.py rename to setup.py index 810d45e..0f745da 100644 --- a/setup-lib.py +++ b/setup.py @@ -42,6 +42,16 @@ setup( 'plugins.syndicate', 'plugins.vsys', 'plugins.vsys_privs', +# lxc + 'sliver_libvirt', + 'sliver_lxc', + 'cgroups', + 'coresched_lxc', +# vs + 'sliver_vs', + 'coresched_vs', + # this plugin uses vserver for now + 'plugins.drl', ], scripts = [ 'forward_api_calls', -- 2.43.0