From fe5f677710f814fa29706a114e4c03db917e6066 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 5 Mar 2010 12:09:28 +0000 Subject: [PATCH] scaffolding omf resource controller --- onelab-k27-tags.mk | 3 ++- onelab-tags.mk | 3 ++- onelab.mk | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 0e211989..d395c6d9 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -15,7 +15,6 @@ util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-2 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0 @@ -36,6 +35,8 @@ Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-2 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 +omf-SVNPATH := http://svn.planet-lab.org/svn/omf/trunk BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 diff --git a/onelab-tags.mk b/onelab-tags.mk index 599903bf..2adde614 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -18,7 +18,6 @@ util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-2 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0 @@ -40,6 +39,8 @@ Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-2 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 +omf-SVNPATH := http://svn.planet-lab.org/svn/omf/trunk BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 diff --git a/onelab.mk b/onelab.mk index 3d34e0bf..0d3ac957 100644 --- a/onelab.mk +++ b/onelab.mk @@ -376,6 +376,14 @@ ALL += pyplnet IN_BOOTSTRAPFS += pyplnet IN_BOOTCD += pyplnet +# +# OMF resource controller +# +omf-resctl-MODULES := omf +omf-resctl-SPEC := omf-resctl.spec +ALL += omf-resctl +IN_VSERVER += omf-resctl + # # bootcd # -- 2.47.0