diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:55 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:55 +0000 |
| commit | c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09 (patch) | |
| tree | 0add7df4e0af19f57962cb194bb0cf391009509a /modules/buildsystem/manifests/create_upload_dir.rb | |
| parent | 5cc49d9ec995b3a54790ad682fe88def2ab3b584 (diff) | |
| download | puppet-c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09.tar puppet-c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09.tar.gz puppet-c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09.tar.bz2 puppet-c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09.tar.xz puppet-c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09.zip | |
buildsystem::create_upload_dir: remove parameters
Remove parameters for buildsystem::create_upload_dir. Instead access
configuration variables directly.
Diffstat (limited to 'modules/buildsystem/manifests/create_upload_dir.rb')
| -rw-r--r-- | modules/buildsystem/manifests/create_upload_dir.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index 323c62d1..43f9dc9c 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -1,22 +1,24 @@ -define "buildsystem::create_upload_dir", :owner, :group, :releases do +define "buildsystem::create_upload_dir" do states = ["todo","done","failure","queue","rejected"] + owner = scope.lookupvar('buildsystem::var::scheduler::login') + group = owner - file @name, :ensure => 'directory', :owner => @owner, :group => @group + file @name, :ensure => 'directory', :owner => owner, :group => group for st in states do - file [@name, st].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + file [@name, st].join('/'), :ensure => 'directory', :owner => owner, :group => group - @releases.each{|rel, repositories| - file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + scope.lookupvar('buildsystem::mgarepo::releases').each{|rel, repositories| + file [@name, st, rel].join('/'), :ensure => 'directory', :owner => owner, :group => group repositories.each{|rep, medias| - file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => owner, :group => group for med in medias do if st == 'done' - file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner, :group => @group, :mode => 0775 + file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => owner, :group => group, :mode => 0775 else - file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => owner, :group => group end end } |