From d683d602ebfdd043e604af871adcad17933e882e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias@busybox.se>
Date: Fri, 27 Jul 2018 14:20:19 +0200
Subject: [PATCH] Mirror puppet5 for Ubuntu Bionic

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
---
 modules/openstack_project/manifests/mirror_update.pp          | 2 +-
 .../templates/reprepro/distributions.apt-puppetlabs.erb       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index 55aae49a84..a7ad964561 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -384,7 +384,7 @@ class openstack_project::mirror_update (
     basedir       => '/afs/.openstack.org/mirror/apt-puppetlabs',
     distributions => 'openstack_project/reprepro/distributions.apt-puppetlabs.erb',
     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':
diff --git a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
index ebbd5adcf5..809b18cd8f 100644
--- a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
@@ -1,9 +1,9 @@
-<% @releases.each do |release| -%>
+<% @releases.each do |release, components| -%>
 Origin: Puppetlabs
 Codename: <%= release %>
 Description: PuppetLabs <%= release.capitalize %> mirror
 Architectures: amd64
-Components: PC1 puppet5
+Components: <%= components %>
 Contents: .gz
 Update: puppetlabs-debs
 Log: <%= @logdir %>/ubuntu-puppetlabs-<%= release %>.log