diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:57 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:04:57 +0000 |
| commit | b919b72d6572d3ee1d5d7ff77238e2a277d747dd (patch) | |
| tree | 7811a0ed6c7f093466cc21c5c5a28673769dd25c | |
| parent | c7b64c4b7bffac4ae7050a5ecc2627f51d9fdc09 (diff) | |
| download | puppet-b919b72d6572d3ee1d5d7ff77238e2a277d747dd.tar puppet-b919b72d6572d3ee1d5d7ff77238e2a277d747dd.tar.gz puppet-b919b72d6572d3ee1d5d7ff77238e2a277d747dd.tar.bz2 puppet-b919b72d6572d3ee1d5d7ff77238e2a277d747dd.tar.xz puppet-b919b72d6572d3ee1d5d7ff77238e2a277d747dd.zip | |
Make buildsystem::create_upload_dir a class instead of a define
buildsystem::create_upload_dir is used only once, so it should be a
class and not a define.
| -rw-r--r-- | modules/buildsystem/manifests/create_upload_dir.rb | 15 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index 43f9dc9c..dcd27afe 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -1,24 +1,25 @@ -define "buildsystem::create_upload_dir" do +hostclass "buildsystem::create_upload_dir" do states = ["todo","done","failure","queue","rejected"] owner = scope.lookupvar('buildsystem::var::scheduler::login') group = owner + uploads_dir = scope.lookupvar('buildsystem::var::scheduler::homedir') + '/uploads' - file @name, :ensure => 'directory', :owner => owner, :group => group + file uploads_dir, :ensure => 'directory', :owner => owner, :group => group for st in states do - file [@name, st].join('/'), :ensure => 'directory', :owner => owner, :group => group + file [uploads_dir, st].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 + file [uploads_dir, 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 [uploads_dir, 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 [uploads_dir, 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 [uploads_dir, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => owner, :group => group end end } diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index e0b714c5..6078ee51 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -57,7 +57,7 @@ class buildsystem::mgarepo { }, } - create_upload_dir { "$sched_home_dir/uploads": } + include buildsystem::create_upload_dir tidy { "$sched_home_dir/uploads": type => 'ctime', |