diff options
| -rw-r--r-- | manifests/nodes.pp | 4 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 38 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt.cauldron.conf (renamed from modules/iurt/templates/iurt.cauldron.conf) | 0 | ||||
| -rw-r--r-- | modules/iurt/manifests/init.pp | 20 |
4 files changed, 40 insertions, 22 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 3683985c..6948f1d2 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -60,7 +60,7 @@ node jonund { # Location: IELO datacenter (marseille) # include default_mageia_server - #include iurt + #include buildsystem::buildnode timezone::timezone { "Europe/Paris": } } @@ -68,7 +68,7 @@ node ecosse { # Location: IELO datacenter (marseille) # include default_mageia_server - include iurt + include buildsystem::buildnode timezone::timezone { "Europe/Paris": } } diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp new file mode 100644 index 00000000..0cc24ed4 --- /dev/null +++ b/modules/buildsystem/manifests/init.pp @@ -0,0 +1,38 @@ +class buildsystem { + + class buildnode { + include iurt + } + + 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", + } + } +} diff --git a/modules/iurt/templates/iurt.cauldron.conf b/modules/buildsystem/templates/iurt.cauldron.conf index 5a7f047e..5a7f047e 100644 --- a/modules/iurt/templates/iurt.cauldron.conf +++ b/modules/buildsystem/templates/iurt.cauldron.conf diff --git a/modules/iurt/manifests/init.pp b/modules/iurt/manifests/init.pp deleted file mode 100644 index 366e100f..00000000 --- a/modules/iurt/manifests/init.pp +++ /dev/null @@ -1,20 +0,0 @@ -class iurt { - - # 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/buildbot/.iurt.cauldron.conf': - ensure => present, - owner => buildbot, - group => buildbot, - mode => 644, - content => template("iurt/iurt.cauldron.conf") - } - -} - |