diff options
author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 00:03:40 +0300 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 00:03:40 +0300 |
commit | 537a14a19d232672f15a41aa8b4e0423b2fb216e (patch) | |
tree | 01cdccef44da06300fbe57911966b78ee777afb3 /modules/buildsystem/manifests/distros.rb | |
parent | a0621b95e1cdd3c87ff7eb8e25884d27f3938e4b (diff) | |
download | puppet-537a14a19d232672f15a41aa8b4e0423b2fb216e.tar puppet-537a14a19d232672f15a41aa8b4e0423b2fb216e.tar.gz puppet-537a14a19d232672f15a41aa8b4e0423b2fb216e.tar.bz2 puppet-537a14a19d232672f15a41aa8b4e0423b2fb216e.tar.xz puppet-537a14a19d232672f15a41aa8b4e0423b2fb216e.zip |
lint fixes for buildsystem
Diffstat (limited to 'modules/buildsystem/manifests/distros.rb')
-rw-r--r-- | modules/buildsystem/manifests/distros.rb | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/modules/buildsystem/manifests/distros.rb b/modules/buildsystem/manifests/distros.rb index 5af2264f..b383717b 100644 --- a/modules/buildsystem/manifests/distros.rb +++ b/modules/buildsystem/manifests/distros.rb @@ -7,89 +7,89 @@ hostclass "buildsystem::distros" do schedbot_user = scope.lookupvar('buildsystem::var::scheduler::login') bootstrap_reporoot = scope.lookupvar('buildsystem::var::repository::bootstrap_reporoot') scope.lookupvar('buildsystem::var::distros::distros').each{|rel, distro| - file [ bootstrap_reporoot, rel ].join('/'), :ensure => 'directory', - :owner => mirror_user, :group => mirror_user - for arch in distro['arch'] do - # As ruby dsl cannot use defined resources, we have to use a - # workaround with 'find_resource_type' as described in this - # puppet issue: http://projects.puppetlabs.com/issues/11912 - scope.find_resource_type 'buildsystem::media_cfg' - media_cfg_args = { - :distro_name => rel, - :arch => arch, - } - if distro['tmpl_media.cfg'] != nil - media_cfg_args['templatefile'] = distro['tmpl_media.cfg'] - end + file [ bootstrap_reporoot, rel ].join('/'), :ensure => 'directory', + :owner => mirror_user, :group => mirror_user + for arch in distro['arch'] do + # As ruby dsl cannot use defined resources, we have to use a + # workaround with 'find_resource_type' as described in this + # puppet issue: http://projects.puppetlabs.com/issues/11912 + scope.find_resource_type 'buildsystem::media_cfg' + media_cfg_args = { + :distro_name => rel, + :arch => arch, + } + if distro['tmpl_media.cfg'] != nil + media_cfg_args['templatefile'] = distro['tmpl_media.cfg'] + end if ! distro['no_media_cfg_update'] create_resource 'buildsystem::media_cfg', [ rel, ' ', arch ].join('/'), media_cfg_args end - file [ bootstrap_reporoot, rel, arch ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - mediadir = [ bootstrap_reporoot, rel, arch, 'media' ].join('/') - file mediadir, :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - file [ mediadir, 'media_info' ].join('/'), :ensure => 'directory', - :owner => schedbot_user, :group => schedbot_user - file [ mediadir, 'debug' ].join('/'), :ensure => 'directory', - :owner => mirror_user, :group => mirror_user - distro['medias'].each{|media, m| - file [ mediadir, media ].join('/'), :ensure => 'directory', - :owner => schedbot_user, :group => schedbot_user - file [ mediadir, 'debug', media ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - for repo in m['repos'].keys do - file [ mediadir, media, repo ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - file [ mediadir, media, repo, 'media_info' ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - file [ mediadir, 'debug', media, repo ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - file [ mediadir, 'debug', media, repo, 'media_info' ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - end - } - if distro['based_on'] != nil - distro['based_on'].each{|bdistroname, medias| - file [ mediadir, bdistroname ].join('/'), - :ensure => 'directory', :owner => mirror_user, - :group => mirror_user - medias.each{|medianame, media| - mdir = [ mediadir, bdistroname, medianame ].join('/') - file mdir, :ensure => 'directory', - :owner => mirror_user, :group => mirror_user - for reponame in media - file [ mdir, reponame ].join('/'), - :ensure => 'link', - :target => [ - '../../../../..', bdistroname, arch, - 'media', medianame, reponame ].join('/'), - :owner => mirror_user, :group => mirror_user - end - } - } - end - end - # SRPMS - srpmsdir = [ bootstrap_reporoot, rel, 'SRPMS' ].join('/') - file srpmsdir, - :ensure => 'directory', :owner => mirror_user, - :group => mirror_user - distro['medias'].each{|media, m| - file [ srpmsdir, media ].join('/'), :ensure => 'directory', - :owner => schedbot_user, :group => schedbot_user - for repo in m['repos'].keys do - file [ srpmsdir, media, repo ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - end - } + file [ bootstrap_reporoot, rel, arch ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + mediadir = [ bootstrap_reporoot, rel, arch, 'media' ].join('/') + file mediadir, :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + file [ mediadir, 'media_info' ].join('/'), :ensure => 'directory', + :owner => schedbot_user, :group => schedbot_user + file [ mediadir, 'debug' ].join('/'), :ensure => 'directory', + :owner => mirror_user, :group => mirror_user + distro['medias'].each{|media, m| + file [ mediadir, media ].join('/'), :ensure => 'directory', + :owner => schedbot_user, :group => schedbot_user + file [ mediadir, 'debug', media ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + for repo in m['repos'].keys do + file [ mediadir, media, repo ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + file [ mediadir, media, repo, 'media_info' ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + file [ mediadir, 'debug', media, repo ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + file [ mediadir, 'debug', media, repo, 'media_info' ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + end + } + if distro['based_on'] != nil + distro['based_on'].each{|bdistroname, medias| + file [ mediadir, bdistroname ].join('/'), + :ensure => 'directory', :owner => mirror_user, + :group => mirror_user + medias.each{|medianame, media| + mdir = [ mediadir, bdistroname, medianame ].join('/') + file mdir, :ensure => 'directory', + :owner => mirror_user, :group => mirror_user + for reponame in media + file [ mdir, reponame ].join('/'), + :ensure => 'link', + :target => [ + '../../../../..', bdistroname, arch, + 'media', medianame, reponame ].join('/'), + :owner => mirror_user, :group => mirror_user + end + } + } + end + end + # SRPMS + srpmsdir = [ bootstrap_reporoot, rel, 'SRPMS' ].join('/') + file srpmsdir, + :ensure => 'directory', :owner => mirror_user, + :group => mirror_user + distro['medias'].each{|media, m| + file [ srpmsdir, media ].join('/'), :ensure => 'directory', + :owner => schedbot_user, :group => schedbot_user + for repo in m['repos'].keys do + file [ srpmsdir, media, repo ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + end + } } end |