clean and make puppet-lint happy

1 files changed, 35 insertions, 36 deletions

diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
index 26b32c97..e545f270 100644
--- a/modules/buildsystem/manifests/iurt.pp
+++ b/modules/buildsystem/manifests/iurt.pp
@@ -1,45 +1,44 @@
-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,
-        }
+class buildsystem::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
+    }
 
-        # 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 = ['iurt']
-        package { $package_list: }
+    # 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,
+    }
 
-        file { "/etc/iurt/build":
-            ensure => "directory",
-        }
+# 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 { 'iurt': }
 
-        define iurt_config() {
+    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")
-            }
+        $distribution = $name
+        file { "/etc/iurt/build/$distribution.conf":
+            owner   => $buildsystem::iurt::build_login,
+            group   => $buildsystem::iurt::build_login,
+            content => template("buildsystem/iurt/$distribution.conf")
         }
+    }
 
-        iurt_config { ["1","cauldron","mandriva2010.1","infra_1"]: }
+    iurt_config { ['1','cauldron','mandriva2010.1','infra_1']: }
 
-       	sudo::sudoers_config { "iurt":
-            content => template("buildsystem/iurt/sudoers.iurt")
-        }
+    sudo::sudoers_config { 'iurt':
+        content => template('buildsystem/iurt/sudoers.iurt')
     }
 }