From 01309ee29768c3e161eeca266f56650f432edd36 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 8 Jan 2012 14:52:07 +0000 Subject: refactor media.cfg declaration --- modules/buildsystem/manifests/init.pp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index 4cbc737a..d08d73f7 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -56,21 +56,16 @@ class buildsystem { source => "svn://svn.$domain/soft/buildsystem/web/", } - file { "$repository_root/distrib/cauldron/i586/media/media_info/media.cfg": - ensure => present, - owner => $sched_login, - group => $sched_login, - mode => 644, - source => "puppet:///modules/buildsystem/i586/media.cfg", - } + define media_cfg() { + $arch = $name + file { "$repository_root/distrib/cauldron/$arch/media/media_info/media.cfg": + owner => $sched_login, + group => $sched_login, + source => "puppet:///modules/buildsystem/$arch/media.cfg", + } + } - file { "$repository_root/distrib/cauldron/x86_64/media/media_info/media.cfg": - ensure => present, - owner => $sched_login, - group => $sched_login, - mode => 644, - source => "puppet:///modules/buildsystem/x86_64/media.cfg", - } + media_cfg { ["i586","x86_64"]: } include scheduler include gatherer -- cgit v1.2.1