Add puppetlabs apt puppet5 pool
This adds the puppet5 pools for puppetlabs apt mirror. We need these two pools to get latest puppet5 versions on Debian and Ubuntu: * http://apt.puppetlabs.com/pool/xenial/puppet5/ * http://apt.puppetlabs.com/pool/stretch/puppet5/ The yum puppetlabs mirror is correct and after this fix we can properly use the latest version available in CI. Change-Id: Ic5f7a20bcc8181f1dc55dedfaa60c622defe9c43
This commit is contained in:
parent
f1c201288d
commit
d7b35e66af
@ -1,6 +1,6 @@
|
||||
Name: puppetlabs-debs-pc1
|
||||
Name: puppetlabs-debs
|
||||
Method: https://apt.puppetlabs.com/
|
||||
Components: PC1
|
||||
Components: PC1 puppet5
|
||||
UDebComponents:
|
||||
Architectures: amd64
|
||||
GetInRelease: no
|
@ -333,7 +333,7 @@ class openstack_project::mirror_update (
|
||||
confdir => '/etc/reprepro/apt-puppetlabs',
|
||||
basedir => '/afs/.openstack.org/mirror/apt-puppetlabs',
|
||||
distributions => 'openstack_project/reprepro/distributions.apt-puppetlabs.erb',
|
||||
updates_file => 'puppet:///modules/openstack_project/reprepro/puppetlabs-debs-pc1',
|
||||
updates_file => 'puppet:///modules/openstack_project/reprepro/puppetlabs-debs',
|
||||
releases => ['xenial', 'stretch'],
|
||||
}
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
<% @releases.each do |release| -%>
|
||||
Origin: Puppetlabs
|
||||
Codename: <%= release %>
|
||||
Description: Puppetlabs <%= release.capitalize %> mirror
|
||||
Description: PuppetLabs <%= release.capitalize %> mirror
|
||||
Architectures: amd64
|
||||
Components: PC1
|
||||
Components: PC1 puppet5
|
||||
Contents: .gz
|
||||
Update: puppetlabs-debs-pc1
|
||||
Update: puppetlabs-debs
|
||||
Log: <%= @logdir %>/ubuntu-puppetlabs-<%= release %>.log
|
||||
|
||||
<% end -%>
|
||||
|
Loading…
Reference in New Issue
Block a user