clean all puppet-lint warning in nodes/

11 files changed, 51 insertions, 53 deletions

diff --git a/manifests/nodes/arm1.pp b/manifests/nodes/arm1.pp
index 5cf27c5b..6409f9b4 100644
--- a/manifests/nodes/arm1.pp
+++ b/manifests/nodes/arm1.pp
@@ -1,7 +1,5 @@
 node arm1 {
 # Location: IELO datacenter (marseille)
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
-
-
+    timezone::timezone { 'Europe/Paris': }
 }
diff --git a/manifests/nodes/arm2.pp b/manifests/nodes/arm2.pp
index 94700892..2cd94b71 100644
--- a/manifests/nodes/arm2.pp
+++ b/manifests/nodes/arm2.pp
@@ -1,5 +1,5 @@
 node arm2 {
 # Location: IELO datacenter (marseille)
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
 }
diff --git a/manifests/nodes/champagne.pp b/manifests/nodes/champagne.pp
index bd722aba..11370e59 100644
--- a/manifests/nodes/champagne.pp
+++ b/manifests/nodes/champagne.pp
@@ -5,7 +5,7 @@ node champagne {
 # - setup mageia.org web site
 #
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
     include blog::files-bots
     include blog::files_backup
     include planet
diff --git a/manifests/nodes/ecosse.pp b/manifests/nodes/ecosse.pp
index e2b80924..a106d0ed 100644
--- a/manifests/nodes/ecosse.pp
+++ b/manifests/nodes/ecosse.pp
@@ -3,5 +3,5 @@ node ecosse {
 #
     include common::default_mageia_server
     include buildsystem::buildnode
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
 }
diff --git a/manifests/nodes/fiona.pp b/manifests/nodes/fiona.pp
index d47ebed8..4fdc9319 100644
--- a/manifests/nodes/fiona.pp
+++ b/manifests/nodes/fiona.pp
@@ -7,5 +7,5 @@ node fiona {
 # - install the server in datacenter
 # - install a backup system
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
 }
diff --git a/manifests/nodes/friteuse.pp b/manifests/nodes/friteuse.pp
index 59d4761a..9c0fdde1 100644
--- a/manifests/nodes/friteuse.pp
+++ b/manifests/nodes/friteuse.pp
@@ -1,8 +1,7 @@
 node friteuse {
 # Location: VM hosted by nfrance (toulouse)
-# 
-
+#
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
     include forums
 }
diff --git a/manifests/nodes/jonund.pp b/manifests/nodes/jonund.pp
index 5f0b0296..ff448844 100644
--- a/manifests/nodes/jonund.pp
+++ b/manifests/nodes/jonund.pp
@@ -5,7 +5,7 @@ node jonund {
     include common::default_mageia_server
     include buildsystem::buildnode
     include buildsystem::iurt20101
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
 #    include shorewall
 #    include shorewall::default_firewall
 }
diff --git a/manifests/nodes/krampouezh.pp b/manifests/nodes/krampouezh.pp
index 91510972..dc8fcdbc 100644
--- a/manifests/nodes/krampouezh.pp
+++ b/manifests/nodes/krampouezh.pp
@@ -9,10 +9,10 @@ node krampouezh {
     include blog::base
     include blog::db_backup
     include mysql::server
-    include dns::server 
-    timezone::timezone { "Europe/Paris": }
+    include dns::server
+    timezone::timezone { 'Europe/Paris': }
 
-    openldap::slave_instance { "1":
+    openldap::slave_instance { '1':
         rid => 1,
     }
 
diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp
index 238908e4..0660c52c 100644
--- a/manifests/nodes/rabbit.pp
+++ b/manifests/nodes/rabbit.pp
@@ -1,10 +1,10 @@
 node rabbit {
 # Location: Server offered by Dedibox (paris)
-# 
+#
 # - used to create isos ( and live, and so on )
-# 
+#
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
     include bcd::base
     include bcd::web
     include bcd::rsync
@@ -15,60 +15,61 @@ node rabbit {
     include mirror::newrelease
     include releasekey
 
-    youri-check::config {"config_cauldron":
-	version => "cauldron",
+    youri-check::config {'config_cauldron':
+        version => 'cauldron',
     }
-    youri-check::check {"check_cauldron":
-	version => "cauldron",
-	hour => "*",
-	minute => 4
+    youri-check::check {'check_cauldron':
+        version => 'cauldron',
+        hour    => '*',
+        minute  => 4
     }
-    youri-check::config {"config_1":
-	version => "1",
+
+    youri-check::config {'config_1':
+        version => '1',
     }
-    youri-check::check {"check_1":
-	version => "1",
-	hour => "*/2",
-	minute => 30
+    youri-check::check {'check_1':
+        version => '1',
+        hour    => '*/2',
+        minute  => 30
     }
 
     # for testing iso quickly
     include libvirtd::kvm
-    libvirtd::group_access { "mga-iso_makers": }
+    libvirtd::group_access { 'mga-iso_makers': }
 
-    # to ease the creation of test iso 
-    $netinst_iso_path = "/var/lib/libvirt/netboot"
+    # to ease the creation of test iso
+    $netinst_iso_path = '/var/lib/libvirt/netboot'
 
     file { $netinst_iso_path:
         ensure => directory,
     }
 
-    libvirtd::storage { "netinst_iso":
-        path => $netinst_iso_path,
+    libvirtd::storage { 'netinst_iso':
+        path    => $netinst_iso_path,
         require => File[$netinst_iso_path],
     }
 
     include auto_installation::download
-    auto_installation::download::netboot_images { "mandriva":
-        path => $netinst_iso_path,
-        versions => ["2010.0","2010.1"],
-        archs => ['i586','x86_64'],
-        mirror_path => "ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/%{version}/%{arch}/install/images/",
-        files => ['boot.iso'],
-        require => File[$netinst_iso_path],
+    auto_installation::download::netboot_images { 'mandriva':
+        path        => $netinst_iso_path,
+        versions    => ['2010.0','2010.1'],
+        archs       => ['i586','x86_64'],
+        mirror_path => 'ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/%{version}/%{arch}/install/images/',
+        files       => ['boot.iso'],
+        require     => File[$netinst_iso_path],
     }
 
     # for testing pxe support of libvirt
     include auto_installation::variables
-    libvirtd::network {"pxe_network":
-        network => "192.168.123.0/24",
-        tftp_root => $auto_installation::variables::pxe_dir,
-        bridge_name => "virbr1",
+    libvirtd::network {'pxe_network':
+        network     => '192.168.123.0/24',
+        tftp_root   => $auto_installation::variables::pxe_dir,
+        bridge_name => 'virbr1',
     }
 
     include auto_installation::pxe_menu
-    auto_installation::mandriva_installation_entry { "pxe_test":
-        version => "2010.1",
-        arch => "i586",
+    auto_installation::mandriva_installation_entry { 'pxe_test':
+        version => '2010.1',
+        arch    => 'i586',
     }
 }
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp
index d8196ac8..6e96c59a 100644
--- a/manifests/nodes/sucuk.pp
+++ b/manifests/nodes/sucuk.pp
@@ -2,5 +2,5 @@
 node sucuk {
 # Location: IELO datacenter (marseille)
     include common::default_mageia_server
-    timezone::timezone { "Europe/Paris": }
+    timezone::timezone { 'Europe/Paris': }
 }
diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp
index 889ba054..787b71c1 100644
--- a/manifests/nodes/valstar.pp
+++ b/manifests/nodes/valstar.pp
@@ -9,7 +9,7 @@ node valstar {
     include common::default_mageia_server
     timezone::timezone { 'Europe/Paris': }
     include main_mirror
-    include openldap::master 
+    include openldap::master
     include subversion::client
     include subversion::server
     include puppet::master
@@ -34,7 +34,7 @@ node valstar {
     # disabled the ldap key here instead of disabling for the
     # whole module ( see r698 )
     class { 'openssh::ssh_keys_from_ldap':
-    	symlink_users => ['schedbot', 'iurt']
+        symlink_users => ['schedbot', 'iurt']
     }
 
     include mirror::mdv2010spring
@@ -55,14 +55,14 @@ node valstar {
 
     # TODO use a dns zone for that
     host { 'arm1':
+        ensure       => present,
         ip           => '10.10.10.11',
         host_aliases => [ "arm1.$::domain" ],
-        ensure       => present,
     }
 
     host { 'arm2':
+        ensure       => present,
         ip           => '10.10.10.12',
         host_aliases => [ "arm2.$::domain" ],
-        ensure       => present,
     }
 }