From 7136db339e9438d12d3f08021a5bab0c0d199c48 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 23 Feb 2024 13:27:17 -0800 Subject: [PATCH] Remove debian buster package mirrors We have successfully removed debian buster from nodepool and zuul at this point. The last major TODO in debian buster cleanup is to remove it from our package mirrors. This change is the first step in making that happen. For step two we follow the manual process documented in our reprepro docs [0] for cleaning up mirror components. We will need to perform these actions against the debian, debian security, and ceph octopus mirrors. [0] https://docs.opendev.org/opendev/system-config/latest/reprepro.html#removing-components Depends-On: https://review.opendev.org/c/openstack/project-config/+/910031 Change-Id: Ic1fc6a45cb7f644d7862312589254b6100e17222 --- .../debian-ceph-octopus/config/distributions | 9 ----- .../debian-security/config/distributions | 12 ------ .../files/debian/config/distributions | 37 ------------------- .../roles/reprepro/tasks/debian-security.yaml | 1 - playbooks/roles/reprepro/tasks/debian.yaml | 1 - 5 files changed, 60 deletions(-) diff --git a/playbooks/roles/reprepro/files/debian-ceph-octopus/config/distributions b/playbooks/roles/reprepro/files/debian-ceph-octopus/config/distributions index cf0ff56710..b3097dea81 100755 --- a/playbooks/roles/reprepro/files/debian-ceph-octopus/config/distributions +++ b/playbooks/roles/reprepro/files/debian-ceph-octopus/config/distributions @@ -1,12 +1,3 @@ -Origin: Ceph Octopus -Codename: buster -Description: OpenStack Debian Ceph Octopus Buster mirror -Architectures: amd64 -Components: main -Contents: .gz -Update: debian-ceph-octopus -Log: /var/log/reprepro/debian-ceph-octopus-buster.log - Origin: Ceph Octopus Codename: focal Description: OpenStack Debian Ceph Octopus Focal mirror diff --git a/playbooks/roles/reprepro/files/debian-security/config/distributions b/playbooks/roles/reprepro/files/debian-security/config/distributions index 1c51dad491..8975f908be 100755 --- a/playbooks/roles/reprepro/files/debian-security/config/distributions +++ b/playbooks/roles/reprepro/files/debian-security/config/distributions @@ -1,15 +1,3 @@ -Origin: Debian Security -Codename: buster -Suite: updates -Description: OpenStack Debian Security Buster mirror -Architectures: amd64 arm64 -Components: main -UDebComponents: main -Contents: .gz -Update: debian-security -Log: /var/log/reprepro/debian-security-buster.log - - Origin: Debian Security Codename: bullseye-security Suite: updates diff --git a/playbooks/roles/reprepro/files/debian/config/distributions b/playbooks/roles/reprepro/files/debian/config/distributions index e74c58bb8e..f9467bca04 100755 --- a/playbooks/roles/reprepro/files/debian/config/distributions +++ b/playbooks/roles/reprepro/files/debian/config/distributions @@ -1,40 +1,3 @@ -Origin: Debian -Label: Debian -Codename: buster -Description: OpenStack Debian Buster mirror -Architectures: amd64 arm64 -Components: main -UDebComponents: main -Contents: .gz -Update: debian -Log: /var/log/reprepro/debian-buster.log - -Origin: Debian -Label: Debian -Codename: buster-updates -Description: OpenStack Debian Buster Updates mirror -Architectures: amd64 arm64 -Components: main -UDebComponents: main -Contents: .gz -Update: debian -Log: /var/log/reprepro/debian-buster-updates.log - - -Origin: Debian Backports -Label: Debian Backports -Codename: buster-backports -NotAutomatic: yes -ButAutomaticUpgrades: yes -Description: OpenStack Debian Buster Backports mirror -Architectures: amd64 arm64 -Components: main -UDebComponents: main -Contents: .gz -Update: debian -Log: /var/log/reprepro/debian-buster-backports.log - - Origin: Debian Label: Debian Codename: bullseye diff --git a/playbooks/roles/reprepro/tasks/debian-security.yaml b/playbooks/roles/reprepro/tasks/debian-security.yaml index 328d6d7213..17dac973af 100644 --- a/playbooks/roles/reprepro/tasks/debian-security.yaml +++ b/playbooks/roles/reprepro/tasks/debian-security.yaml @@ -4,7 +4,6 @@ _dir: 'debian-security' _volume: 'mirror.debian-security' _keys: - - { key_id: '4DFAB270CAA96DFA', file: 'debian-buster-security.asc' } - { key_id: 'A48449044AAD5C5D', file: 'debian-bullseye-security.asc' } - { key_id: '254CF3B5AEC0A8F0', file: 'debian-bookworm-security.asc'} diff --git a/playbooks/roles/reprepro/tasks/debian.yaml b/playbooks/roles/reprepro/tasks/debian.yaml index 40bb609a57..1f3631dd11 100644 --- a/playbooks/roles/reprepro/tasks/debian.yaml +++ b/playbooks/roles/reprepro/tasks/debian.yaml @@ -4,7 +4,6 @@ _dir: 'debian' _volume: 'mirror.debian' _keys: - - { key_id: 'DC30D7C23CBBABEE', file: 'debian-buster.asc' } - { key_id: '73A4F27B8DD47936', file: 'debian-bullseye.asc' } - { key_id: 'B7C5D7D6350947F8', file: 'debian-bookworm.asc' }