Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp 2010-11-09 14:25:10 UTC (rev 212)
+++ puppet/manifests/nodes.pp 2010-11-09 15:01:12 UTC (rev 213)
@@ -60,7 +60,7 @@
# Location: IELO datacenter (marseille)
#
include default_mageia_server
- #include iurt
+ #include buildsystem::buildnode
timezone::timezone { "Europe/Paris": }
}
@@ -68,7 +68,7 @@
# Location: IELO datacenter (marseille)
#
include default_mageia_server
- include iurt
+ include buildsystem::buildnode
timezone::timezone { "Europe/Paris": }
}
Modified: puppet/modules/buildsystem/manifests/init.pp
===================================================================
--- puppet/modules/iurt/manifests/init.pp 2010-11-09 14:25:10 UTC (rev 212)
+++ puppet/modules/buildsystem/manifests/init.pp 2010-11-09 15:01:12 UTC (rev 213)
@@ -1,20 +1,38 @@
-class iurt {
+class buildsystem {
- # build node common settings
- # we could have the following skip list to use less space:
- # '/(drakx-installer-binaries|drakx-installer-advertising|gfxboot|drakx-installer-stage2|mandriva-theme)/'
- $package_list = ['task-bs-cluster-chroot', 'iurt']
- package { $package_list:
- ensure => installed;
+ class buildnode {
+ include iurt
}
- file { '/home/buildbot/.iurt.cauldron.conf':
- ensure => present,
- owner => buildbot,
- group => buildbot,
- mode => 644,
- content => template("iurt/iurt.cauldron.conf")
+ class iurt {
+
+ $home_dir = "/home/buildbot/"
+ $build_login = "buildbot"
+ # build node common settings
+ # we could have the following skip list to use less space:
+ # '/(drakx-installer-binaries|drakx-installer-advertising|gfxboot|drakx-installer-stage2|mandriva-theme)/'
+ $package_list = ['task-bs-cluster-chroot', 'iurt']
+ package { $package_list:
+ ensure => installed;
+ }
+
+ file { "$home_dir/.iurt.cauldron.conf":
+ ensure => present,
+ owner => $build_login,
+ group => $build_login,
+ mode => 644,
+ content => template("iurt/iurt.cauldron.conf")
+ }
+
+ group {"$build_login":
+ ensure => present,
+ }
+
+ user {"$build_login":
+ ensure => present,
+ comment => "System user use to run build bots"
+ managehome => true,
+ shell => "/bin/bash",
+ }
}
-
}
-