From d7b35e66af537d6d0070c6ac97652cec4e155106 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias@busybox.se>
Date: Wed, 2 May 2018 20:45:54 +0200
Subject: [PATCH] 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
---
 .../files/reprepro/{puppetlabs-debs-pc1 => puppetlabs-debs} | 4 ++--
 modules/openstack_project/manifests/mirror_update.pp        | 2 +-
 .../templates/reprepro/distributions.apt-puppetlabs.erb     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/openstack_project/files/reprepro/{puppetlabs-debs-pc1 => puppetlabs-debs} (71%)

diff --git a/modules/openstack_project/files/reprepro/puppetlabs-debs-pc1 b/modules/openstack_project/files/reprepro/puppetlabs-debs
similarity index 71%
rename from modules/openstack_project/files/reprepro/puppetlabs-debs-pc1
rename to modules/openstack_project/files/reprepro/puppetlabs-debs
index 33f7a533de..444a1be591 100644
--- a/modules/openstack_project/files/reprepro/puppetlabs-debs-pc1
+++ b/modules/openstack_project/files/reprepro/puppetlabs-debs
@@ -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
diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index bffd492d6f..2055963e56 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -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'],
   }
 
diff --git a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
index 61ad76c86d..ebbd5adcf5 100644
--- a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
@@ -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 -%>