split iurt in a submodule

2 files changed, 46 insertions, 43 deletions

diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index 251270ff..0d471350 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -82,7 +82,7 @@ class buildsystem {
     }
 
     class buildnode inherits base {
-        include iurt
+        include buildsystem::iurt
     }
 
     class scheduler {
@@ -247,48 +247,6 @@ class buildsystem {
         }
     }
 
-    class iurt {
-        include sudo
-        include iurtuser
-        ssh::auth::client { $build_login: }
-        ssh::auth::server { $sched_login: user => $build_login }
-
-        $tidy_age = "8w"
-        # remove old build directory
-        tidy { "$build_home_dir/iurt":
-            age => $tidy_age,
-            recurse => true,
-            matches => ['[0-9][0-9].*\..*\..*\.[0-9]*',"log","*.rpm","*.log","*.mga[0-9]+"],
-            rmdirs => true,
-        }
-
-        # 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: }
-
-        file { "/etc/iurt/build":
-            ensure => "directory",
-        }
-
-        define iurt_config() {
-
-            $distribution = $name
-            file { "/etc/iurt/build/$distribution.conf":
-                owner => $build_login,
-                group => $build_login,
-                content => template("buildsystem/iurt.$distribution.conf")
-            }
-        }
-
-        iurt_config { ["1","cauldron","mandriva2010.1"]: }
-
-       	sudo::sudoers_config { "iurt":
-            content => template("buildsystem/sudoers.iurt")
-        }
-    }
-
     # A script to copy on valstar the 2010.1 rpms built on jonund
     class sync20101 inherits base {
         local_script { "sync2010.1":
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
new file mode 100644
index 00000000..b12ec9b0
--- /dev/null
+++ b/modules/buildsystem/manifests/iurt.pp
@@ -0,0 +1,45 @@
+class buildsystem {
+    class iurt {
+        include sudo
+        include buildsystem::iurtuser
+        $build_login = $buildsystem::base::build_login;
+        $build_home_dir = $buildsystem::base::build_home_dir;
+
+        ssh::auth::client { $build_login: }
+        ssh::auth::server { $buildsystem::base::sched_login: user => $build_login }
+
+        # remove old build directory
+        tidy { "$build_home_dir/iurt":
+            age => "8w",
+            recurse => true,
+            matches => ['[0-9][0-9].*\..*\..*\.[0-9]*',"log","*.rpm","*.log","*.mga[0-9]+"],
+            rmdirs => true,
+        }
+
+        # 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: }
+
+        file { "/etc/iurt/build":
+            ensure => "directory",
+        }
+
+        define iurt_config() {
+
+            $distribution = $name
+            file { "/etc/iurt/build/$distribution.conf":
+                owner => $build_login,
+                group => $build_login,
+                content => template("buildsystem/iurt.$distribution.conf")
+            }
+        }
+
+        iurt_config { ["1","cauldron","mandriva2010.1"]: }
+
+       	sudo::sudoers_config { "iurt":
+            content => template("buildsystem/sudoers.iurt")
+        }
+    }
+}