From 327cfa78933da104b2264b833932a63bfe68a2c0 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 28 Mar 2019 10:52:58 +1100
Subject: [PATCH] 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
---
 modules/openstack_project/manifests/mirror_update.pp  | 11 ++++++-----
 modules/openstack_project/manifests/reprepro.pp       |  1 +
 .../templates/reprepro/distributions.debian.erb       |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index c64aac0117..45c7d4d79e 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -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':
diff --git a/modules/openstack_project/manifests/reprepro.pp b/modules/openstack_project/manifests/reprepro.pp
index 72f4a81d18..8f812908be 100644
--- a/modules/openstack_project/manifests/reprepro.pp
+++ b/modules/openstack_project/manifests/reprepro.pp
@@ -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,
diff --git a/modules/openstack_project/templates/reprepro/distributions.debian.erb b/modules/openstack_project/templates/reprepro/distributions.debian.erb
index db66831eb9..06e74315e8 100644
--- a/modules/openstack_project/templates/reprepro/distributions.debian.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.debian.erb
@@ -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 -%>