diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-31 09:32:43 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-31 09:32:43 +0000 |
| commit | 5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc (patch) | |
| tree | 010a0cdd96640c3dd924320a5a7cc964d372a332 | |
| parent | e808760d4909bc2d9778b2bb1079db8219c6d473 (diff) | |
| download | puppet-5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc.tar puppet-5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc.tar.gz puppet-5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc.tar.bz2 puppet-5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc.tar.xz puppet-5dd2bf6f4e21ee505fd31c5fa9ecefb3036f59dc.zip | |
buildsystem::distros: remove iurt_use_bootstrap option
This option is no longer needed with the no_mirror option.
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt.conf | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 97435617..66ced566 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -557,7 +557,6 @@ class mga_buildsystem::config { }, }, }, - 'iurt_use_bootstrap' => true, 'no_mirror' => true, }, @@ -589,7 +588,6 @@ class mga_buildsystem::config { }, }, }, - 'iurt_use_bootstrap' => true, 'no_mirror' => true, }, } diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index bef77c08..ca4bbdb8 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -69,8 +69,6 @@ # 'distribution' => 'Mageia', # 'vendor' => 'Mageia.Org', # }, -# # set this if you want iurt to use bootstrap URL -# 'iurt_use_bootstrap' => true, # # set this if the distro is not mirrored. This is used to add # # an Alias in the vhost. # 'no_mirror' => true, diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index 4cf34898..34809afa 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -14,11 +14,7 @@ upload => '<%= build_login %>@pkgsubmit:~/uploads/', upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', unwanted_packages => '^monotone-', -<%- if distro['iurt_use_bootstrap'] -%> - repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/bootstrap/', -<%- else -%> repository => 'http://<%= scope.lookupvar('buildsystem::var::repository::hostname') %>/<%= scope.lookupvar('buildsystem::var::repository::distribdir') %>/', -<%- end -%> log_url => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/queue/build/', admin => 'mageia-sysadm@mageia.org', packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>', |