[Mageia-sysadm] [434] simplify nodes declaration

[root at mageia.org]

Revision: 434
Author:   blino
Date:     2010-11-23 23:57:04 +0100 (Tue, 23 Nov 2010)
Log Message:
-----------
simplify nodes declaration

Modified Paths:
--------------
    puppet/modules/buildsystem/templates/upload.conf

Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf	2010-11-23 22:51:35 UTC (rev 433)
+++ puppet/modules/buildsystem/templates/upload.conf	2010-11-23 22:57:04 UTC (rev 434)
@@ -7,35 +7,31 @@
 #
 ###
 
+my %nodes = (
+   i586 => [ qw(ecosse) ],
+   x86_64 => [ qw(jonund) ],
+);
+
 {
-    bot => { 
-	i586 => {
-	    map {
-		($_ => {	       
-		    iurt => {
-			user => 'iurt',
+    bot => {
+        (map {
+            my $arch = $_;
+            $arch => {
+                map {
+                    my $node = $_;
+                    ($node => {	       
+                        iurt => {
+                            user => 'iurt',
 # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
 #			command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
-			command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
-			packages => '/home/iurt/iurt/',
-			log => '/home/iurt/iurt/', 
-		    },
-		});
-	    } qw(ecosse),
-	},
-
-	x86_64 => {
-	    map {
-		($_ => {	       
-		    iurt => {
-			user => 'iurt',
-			command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
-			packages => '/home/iurt/iurt/',
-			log => '/home/iurt/iurt/', 
-		    },
-		});
-	    } qw(jonund),
-	},
+                            command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
+                            packages => '/home/iurt/iurt/',
+                            log => '/home/iurt/iurt/', 
+                        },
+                    });
+                } @{$nodes{$arch}},
+            };
+        } keys %nodes),
       },
       media => { 
 	    default => { 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101123/b8ecddbe/attachment.html>