diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-08-30 18:26:51 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-08-30 18:26:51 +0000 |
| commit | c11190e6562d30c0c8beb78eb947ff94346cf7ee (patch) | |
| tree | 9917cf00210948260c68ebc4891a9431c9301db7 /modules/buildsystem/manifests | |
| parent | 8fb6fc712a761f7d4416007f3fa4f7f72bdd54da (diff) | |
| download | puppet-c11190e6562d30c0c8beb78eb947ff94346cf7ee.tar puppet-c11190e6562d30c0c8beb78eb947ff94346cf7ee.tar.gz puppet-c11190e6562d30c0c8beb78eb947ff94346cf7ee.tar.bz2 puppet-c11190e6562d30c0c8beb78eb947ff94346cf7ee.tar.xz puppet-c11190e6562d30c0c8beb78eb947ff94346cf7ee.zip | |
use common media.cfg template file for all distros and archs
Diffstat (limited to 'modules/buildsystem/manifests')
| -rw-r--r-- | modules/buildsystem/manifests/mainnode.pp | 9 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/media_cfg.pp | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp index b894eae9..5dc9546a 100644 --- a/modules/buildsystem/manifests/mainnode.pp +++ b/modules/buildsystem/manifests/mainnode.pp @@ -21,5 +21,12 @@ class buildsystem::mainnode { vhost_file => 'buildsystem/vhost_repository.conf', } - buildsystem::media_cfg { ['i586','x86_64']: } + buildsystem::media_cfg { "cauldron i586": + distro => 'cauldron', + arch => 'i586', + } + buildsystem::media_cfg { "cauldron x86_64": + distro => 'cauldron', + arch => 'x86_64', + } } diff --git a/modules/buildsystem/manifests/media_cfg.pp b/modules/buildsystem/manifests/media_cfg.pp index a92cbde0..c6de0d35 100644 --- a/modules/buildsystem/manifests/media_cfg.pp +++ b/modules/buildsystem/manifests/media_cfg.pp @@ -1,12 +1,10 @@ -define buildsystem::media_cfg() { +define buildsystem::media_cfg($distro, $arch, $templatefile = 'buildsystem/media.cfg') { include buildsystem::scheduler::var include buildsystem::repository - $arch = $name - - file { "${buildsystem::repository::dir}/distrib/cauldron/${arch}/media/media_info/media.cfg": + file { "${buildsystem::repository::dir}/distrib/${distro}/${arch}/media/media_info/media.cfg": owner => $buildsystem::base::sched_login, group => $buildsystem::base::sched_login, - source => "puppet:///modules/buildsystem/${arch}/media.cfg", + content => template($templatefile), } } |