From d12d87c43de00029107958360ec6628aa38da1ab Mon Sep 17 00:00:00 2001
From: Olivier Blin <blino@mageia.org>
Date: Sun, 21 Nov 2010 17:42:09 +0000
Subject: move task-bs-cluster-main dep in buildsystem::mainnode

---
 manifests/nodes.pp                    | 4 +---
 modules/buildsystem/manifests/init.pp | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 48044350..0e288fb1 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -18,13 +18,11 @@ node valstar {
     include subversion::client
     include subversion::server
     include puppet::master
+    include buildsystem::mainnode
 
     subversion::snapshot { "/etc/puppet":
         source => "svn://svn.mageia.org/adm/puppet/"
     }
-    package {"task-bs-cluster-main":
-        ensure => "installed"
-    }
 }
 
 # web apps
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index 036fbb3f..c3d88ae1 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -1,5 +1,11 @@
 class buildsystem {
 
+    class mainnode {
+        package { "task-bs-cluster-main":
+            ensure => "installed"
+        }
+    }
+
     class buildnode {
         include iurt
     }
-- 
cgit v1.2.1