opendev/system-config
Code Issues Proposed changes

Merge "Add puppetlabs apt puppet5 pool"

Browse Source
This commit is contained in:
Zuul 2018-05-08 19:43:04 +00:00 committed by Gerrit Code Review
commit a40867b8bf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/reprepro/puppetlabs-debs-pc1 → modules/openstack_project/files/reprepro/puppetlabs-debs
View File

@ -1,6 +1,6 @@
Name: puppetlabs-debs-pc1 Name: puppetlabs-debs
Method: https://apt.puppetlabs.com/ Method: https://apt.puppetlabs.com/
Components: PC1 Components: PC1 puppet5
UDebComponents: UDebComponents:
Architectures: amd64 Architectures: amd64
GetInRelease: no GetInRelease: no

2
modules/openstack_project/manifests/mirror_update.pp
View File

@ -333,7 +333,7 @@ class openstack_project::mirror_update (
confdir => '/etc/reprepro/apt-puppetlabs', confdir => '/etc/reprepro/apt-puppetlabs',
basedir => '/afs/.openstack.org/mirror/apt-puppetlabs', basedir => '/afs/.openstack.org/mirror/apt-puppetlabs',
distributions => 'openstack_project/reprepro/distributions.apt-puppetlabs.erb', 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'], releases => ['xenial', 'stretch'],
} }

6
modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
View File

@ -1,11 +1,11 @@
<% @releases.each do |release| -%> <% @releases.each do |release| -%>
Origin: Puppetlabs Origin: Puppetlabs
Codename: <%= release %> Codename: <%= release %>
Description: Puppetlabs <%= release.capitalize %> mirror Description: PuppetLabs <%= release.capitalize %> mirror
Architectures: amd64 Architectures: amd64
Components: PC1 Components: PC1 puppet5
Contents: .gz Contents: .gz
Update: puppetlabs-debs-pc1 Update: puppetlabs-debs
Log: <%= @logdir %>/ubuntu-puppetlabs-<%= release %>.log Log: <%= @logdir %>/ubuntu-puppetlabs-<%= release %>.log
<% end -%> <% end -%>