From 346f4297d2a5a5941226446c7d8366540654a801 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 18 Apr 2018 13:04:49 -0400 Subject: [PATCH] Remove debian-security from reprepro Currently this is broken on mirror-update.o.o, the reason seems to be upstream security.debian.org is a separate pool, but we are trying to add it into a single pool. This is causing checksum issues on files we download. For now, remove debian-security and update jobs to pull directly from security.debian.org. A follow up patch will move this into its own pool for reprepro creating mirror.debian-security. Change-Id: Id918597aecc5114791811c7f30b6109da6a8d0af Signed-off-by: Paul Belanger --- .../files/reprepro/debuntu-updates | 18 ------------------ .../reprepro/distributions.debian.erb | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/modules/openstack_project/files/reprepro/debuntu-updates b/modules/openstack_project/files/reprepro/debuntu-updates index 7c631f5dcd..718b9c7a0b 100644 --- a/modules/openstack_project/files/reprepro/debuntu-updates +++ b/modules/openstack_project/files/reprepro/debuntu-updates @@ -37,21 +37,3 @@ UDebComponents: main Architectures: amd64 arm64 source GetInRelease: no VerifyRelease: 2B90D010 - -Name: debian-jessie-security -Method: http://security.debian.org/ -Suite: jessie/updates -Components: main -UDebComponents: main -Architectures: amd64 arm64 source -GetInRelease: no -VerifyRelease: C857C906 - -Name: debian-stretch-security -Method: http://security.debian.org/ -Suite: stretch/updates -Components: main -UDebComponents: main -Architectures: amd64 arm64 source -GetInRelease: no -VerifyRelease: C857C906 diff --git a/modules/openstack_project/templates/reprepro/distributions.debian.erb b/modules/openstack_project/templates/reprepro/distributions.debian.erb index 1fa5707536..308fdb4ae9 100644 --- a/modules/openstack_project/templates/reprepro/distributions.debian.erb +++ b/modules/openstack_project/templates/reprepro/distributions.debian.erb @@ -29,14 +29,4 @@ Contents: .gz Update: debian Log: <%= @logdir %>/debian-<%= release %>-backports.log -Origin: Debian -Codename: <%= release %>-security -Description: OpenStack Debian <%= release.capitalize %> Security mirror -Architectures: amd64 arm64 source -Components: main -UDebComponents: main -Contents: .gz -Update: debian-<%= release %>-security -Log: <%= @logdir %>/debian-<%= release %>-security.log - <% end -%>