drop older omf-resctl (and expctl in the same shot) and install rvm-ruby instead

diff --git a/config.onelab/sliceimage-omf.pkgs b/config.onelab/sliceimage-omf.pkgs
index 032b044..4dd4f7e 100644 (file)
--- a/config.onelab/sliceimage-omf.pkgs
+++ b/config.onelab/sliceimage-omf.pkgs
@@ -1,4 +1,4 @@
 #
-groupname: omf-resctl
-groupdesc: OMF Resource Controller image
-package: omf-resctl
+groupname: rvm-ruby
+groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem
+package: rvm-ruby

diff --git a/modules.list b/modules.list
index 87fc3d0..bc3ba53 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -21,6 +21,7 @@ nodeimage
 nodemanager
 nodeupdate
 omf
+rvm-ruby
 oml
 pcucontrol
 pf2slice

diff --git a/onelab-tags.mk b/onelab-tags.mk
index cb295f3..7644806 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -43,9 +43,9 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 ###
 pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-3
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
-oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
+###
 rvm-ruby-GITPATH               := git://git.onelab.eu/rvm-rpm.git@planetlab
+oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 ###
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-2
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-1

diff --git a/onelab.mk b/onelab.mk
index 9d47894..4ccb77b 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -443,28 +443,12 @@ IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_SLICEIMAGE += omf-resctl
-
-#
-# OMF exp controller
-#
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
-
-#
-# rvm-ruby : new install. angle for OMF stuff
+# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
 #
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel
-#not yet
-#ALL += rvm-ruby
+ALL += rvm-ruby
 
 #
 # OML measurement library