opendev/system-config
Code Issues Proposed changes

Mirror puppet5 for Ubuntu Bionic

Browse Source 
Puppet 5 has now been released officialy [1] for
Ubuntu Bionic so we don't have to use the nightly
builds anymore [2].

This adds bionic to be synced from apt.puppetlabs.com
but also changes the structure of the template and the
releases variable to support the Components param for reprepro.

[1] https://apt.puppetlabs.com/pool/bionic/puppet5/p/puppet-agent/
[2] https://github.com/openstack/puppet-openstack-integration/blob/master/functions#L153

Change-Id: I7a303cfcb4408faad5efb703fb127e923b801a81
This commit is contained in:
Tobias Urdin 2018-07-27 14:20:19 +02:00
parent 6402f98d12
commit d683d602eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ class openstack_project::mirror_update (
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', updates_file => 'puppet:///modules/openstack_project/reprepro/puppetlabs-debs',
releases => ['xenial', 'stretch'], releases => { 'xenial' => 'PC1 puppet5', 'stretch' => 'PC1 puppet5', 'bionic' => 'puppet5' },
} }
cron { 'reprepro ubuntu puppetlabs': cron { 'reprepro ubuntu puppetlabs':

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

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