Merge "Start mirroring focal, stop mirroring trusty"

This commit is contained in:
Zuul 2020-04-21 20:19:41 +00:00 committed by Gerrit Code Review
commit b4318aea19

View File

@ -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':