From 2f96a248c82944f1cbb9eb372f8fe836f29818c1 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 11 Jul 2019 11:10:22 -0600 Subject: [PATCH] Add apt-puppetlabs mirroring back This used to be mirrored, however there were issues when upstream dropped the PC1 repositories a few months back. The puppet openstack jobs are still trying to leverage this mirror but it does not exist in some regions because it was disabled on the afs content. This change fixes the reprepo configuration to still pull down puppet5/6 for xenial and strech and add the symlink back to the mirrors. Change-Id: I71ad5afe086a503d75a365543ad8869e35ef873b --- modules/openstack_project/manifests/mirror_update.pp | 2 +- playbooks/roles/mirror/tasks/main.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 8bc5ae0b8d..8b3bee3842 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -319,7 +319,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' => 'PC1 puppet5', 'stretch' => 'PC1 puppet5 puppet6', 'bionic' => 'puppet5 puppet6' }, + releases => { 'xenial' => 'puppet5', 'stretch' => 'puppet5 puppet6', 'bionic' => 'puppet5 puppet6' }, } cron { 'reprepro ubuntu puppetlabs': diff --git a/playbooks/roles/mirror/tasks/main.yaml b/playbooks/roles/mirror/tasks/main.yaml index dc8bb909a6..e58b11b708 100644 --- a/playbooks/roles/mirror/tasks/main.yaml +++ b/playbooks/roles/mirror/tasks/main.yaml @@ -77,6 +77,7 @@ group: root follow: false with_items: + - apt-puppetlabs - centos - ceph-deb-hammer - ceph-deb-jewel