From 1c2aa68647e0d14c7a82695e1025c51206390140 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 17 Apr 2020 08:49:10 -0500 Subject: [PATCH] Start mirroring focal, stop mirroring trusty Focal is released next week and the rc has been cut. The repos are out there, start mirroring them so that we can start building images. While we're at it - we don't do trusty anymore, so stop mirroring it. Change-Id: Ibfe4984b24374862b0bd03cf47c47b0d83e6cacb --- modules/openstack_project/manifests/mirror_update.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 9ec3393929..833666245b 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -156,7 +156,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/ubuntu', distributions => 'openstack_project/reprepro/distributions.ubuntu.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/ubuntu-updates', - releases => ['bionic', 'trusty', 'xenial'], + releases => ['bionic', 'focal', 'xenial'], } cron { 'reprepro ubuntu': @@ -178,7 +178,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/ubuntu-ports', distributions => 'openstack_project/reprepro/distributions.ubuntu-ports.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/ubuntu-updates', - releases => ['bionic', 'xenial'], + releases => ['bionic', 'focal', 'xenial'], } cron { 'reprepro ubuntu-ports': @@ -216,7 +216,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/ceph-deb-hammer', distributions => 'openstack_project/reprepro/distributions.debian-ceph-hammer.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-hammer-updates', - releases => ['trusty', 'xenial'], + releases => ['xenial'], } cron { 'reprepro debian ceph hammer': @@ -238,7 +238,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/ceph-deb-jewel', distributions => 'openstack_project/reprepro/distributions.debian-ceph-jewel.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-jewel-updates', - releases => ['trusty', 'xenial'], + releases => ['xenial'], } cron { 'reprepro debian ceph jewel': @@ -431,7 +431,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/ubuntu-cloud-archive', distributions => 'openstack_project/reprepro/distributions.ubuntu-cloud-archive.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/ubuntu-cloud-archive-updates', - releases => { 'trusty'=>['liberty', 'mitaka'], 'xenial'=>['newton', 'ocata', 'pike', 'queens'], 'bionic'=>['rocky', 'stein', 'train', 'ussuri'] }, + releases => { 'xenial'=>['newton', 'ocata', 'pike', 'queens'], 'bionic'=>['rocky', 'stein', 'train', 'ussuri'] }, } cron { 'reprepro ubuntu-cloud-archive':