Skip backports for buster

This is a follow-on to I39cb9dc0aa52cf5b20545baf4acacc21c5459f2a; as
buster has no backports we need to skip this in the reprepro
configuration.  It's a bit hacky, but we can revert when it is
available.

Change-Id: I60e231f23999d0af9c899a30822c71702befb2bd
This commit is contained in:
Ian Wienand 2019-03-28 10:52:58 +11:00
parent a6beae4eb7
commit 327cfa7893
3 changed files with 9 additions and 5 deletions

View File

@ -59,11 +59,12 @@ class openstack_project::mirror_update (
### Debian mirror ###
::openstack_project::reprepro { 'debian-reprepro-mirror':
confdir => '/etc/reprepro/debian',
basedir => '/afs/.openstack.org/mirror/debian',
distributions => 'openstack_project/reprepro/distributions.debian.erb',
updates_file => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
releases => ['stretch', 'buster'],
confdir => '/etc/reprepro/debian',
basedir => '/afs/.openstack.org/mirror/debian',
distributions => 'openstack_project/reprepro/distributions.debian.erb',
updates_file => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
releases => ['stretch', 'buster'],
skip_backports_for => ['buster'],
}
cron { 'reprepro debian':

View File

@ -8,6 +8,7 @@ define openstack_project::reprepro (
$updates_file = undef,
$options_template = 'openstack_project/reprepro/options.erb',
$releases = [],
$skip_backports_for = [],
) {
file { "$confdir":
ensure => directory,

View File

@ -23,6 +23,7 @@ Contents: .gz
Update: debian
Log: <%= @logdir %>/debian-<%= release %>-updates.log
<% if not @skip_backports_for.include?(release) %>
Origin: Debian Backports
Label: Debian Backports
Suite: <%= release %>-backports
@ -36,5 +37,6 @@ UDebComponents: main
Contents: .gz
Update: debian
Log: <%= @logdir %>/debian-<%= release %>-backports.log
<% end -%>
<% end -%>