aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-21 17:42:09 +0000
committerOlivier Blin <blino@mageia.org>2010-11-21 17:42:09 +0000
commitd12d87c43de00029107958360ec6628aa38da1ab (patch)
tree9d52c758dbc59e0ee9429aedf51ffed69f726d28
parent2bb52588c3989797a20744de5aeb56cd346c826d (diff)
downloadpuppet-d12d87c43de00029107958360ec6628aa38da1ab.tar
puppet-d12d87c43de00029107958360ec6628aa38da1ab.tar.gz
puppet-d12d87c43de00029107958360ec6628aa38da1ab.tar.bz2
puppet-d12d87c43de00029107958360ec6628aa38da1ab.tar.xz
puppet-d12d87c43de00029107958360ec6628aa38da1ab.zip
move task-bs-cluster-main dep in buildsystem::mainnode
-rw-r--r--manifests/nodes.pp4
-rw-r--r--modules/buildsystem/manifests/init.pp6
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
}