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 -%>