Merge "Add puppetlabs apt puppet5 pool"

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

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'],
   }
 

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 -%>