aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-08 14:52:07 +0000
committerMichael Scherer <misc@mageia.org>2012-01-08 14:52:07 +0000
commit01309ee29768c3e161eeca266f56650f432edd36 (patch)
tree7cabd179479535937f189e9b43d4a595803d875b
parentf065bc7554e2bd2ea48eba299f143593520473c2 (diff)
downloadpuppet-01309ee29768c3e161eeca266f56650f432edd36.tar
puppet-01309ee29768c3e161eeca266f56650f432edd36.tar.gz
puppet-01309ee29768c3e161eeca266f56650f432edd36.tar.bz2
puppet-01309ee29768c3e161eeca266f56650f432edd36.tar.xz
puppet-01309ee29768c3e161eeca266f56650f432edd36.zip
refactor media.cfg declaration
-rw-r--r--modules/buildsystem/manifests/init.pp23
1 files 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