review modules/branches to monitor

diff --git a/lxc-tags.mk b/lxc-tags.mk
index fb54753..73bfe80 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -5,8 +5,7 @@ procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@master
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1

-nodemanager-BRANCH             := lxc_devel
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@lxc_devel
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master

 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk

diff --git a/mlab-tags.mk b/mlab-tags.mk
index 70418cf..e7d59b7 100644 (file)
--- a/mlab-tags.mk
+++ b/mlab-tags.mk
@@ -18,6 +18,7 @@ libnl-GITPATH                 := git://git.planet-lab.org/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1

+nodemanager-BRANCH             := 2.0

 nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-37
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-37
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master

diff --git a/modules.list b/modules.list
index 8c44a77..ff6814e 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -1,3 +1,4 @@
+bind_public

 bootcd
 bootmanager
 bootmanager:lxc_devel
 bootcd
 bootmanager
 bootmanager:lxc_devel


@@ -17,7 +18,7 @@ myplc
 nodeconfig
 nodeimage
 nodemanager
 nodeconfig
 nodeimage
 nodemanager

-nodemanager:lxc_devel
+nodemanager:2.0

 nodeupdate
 omf
 oml
 nodeupdate
 omf
 oml

diff --git a/modules.update b/modules.update
index e6e74c0..9e036ab 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -10,6 +10,7 @@ fcdistros="f14 f16"
 ( for fcdistro in $fcdistros; do 
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
 ( for fcdistro in $fcdistros; do 
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;

+    make stage1=true PLDISTRO=mlab PLDISTROTAGS=mlab-tags.mk DISTRONAME=${fcdistro} module-tools ;

     make stage1=true PLDISTRO=lxc PLDISTROTAGS=lxc-tags.mk DISTRONAME=${fcdistro} module-tools ;
   done 2>/dev/null ;
   echo tests
     make stage1=true PLDISTRO=lxc PLDISTROTAGS=lxc-tags.mk DISTRONAME=${fcdistro} module-tools ;
   done 2>/dev/null ;
   echo tests

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 800ff40..f477ccb 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -21,7 +21,7 @@ libnl-GITPATH                 := git://git.onelab.eu/libnl.git@libnl-1.1-2
 util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1

-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@lxc_devel
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master

 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
 fprobe-ulog-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2