From 961bab63d917e0433e9af635b2dfcb9e6e498d3f Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 16 Oct 2020 14:16:19 +1100 Subject: [PATCH] Remove old debian-ceph mirrors The active releases according to [1] are octopus and nautlius. Remove the old releases from our mirroring. This needs manual cleanup of the jobs and volumes -- I will do this manually as this is mostly about clearing out old things before moving the mirroring to Ansible. [1] https://docs.ceph.com/en/latest/releases/ Change-Id: I050f737521fa6837f3b6b52b8028a839a29f7bd2 --- .../files/reprepro/debian-ceph-hammer-updates | 7 -- .../files/reprepro/debian-ceph-jewel-updates | 7 -- .../reprepro/debian-ceph-luminous-updates | 7 -- .../files/reprepro/debian-ceph-mimic-updates | 7 -- .../manifests/mirror_update.pp | 88 ------------------- .../distributions.debian-ceph-hammer.erb | 11 --- .../distributions.debian-ceph-jewel.erb | 11 --- .../distributions.debian-ceph-luminous.erb | 11 --- .../distributions.debian-ceph-mimic.erb | 11 --- 9 files changed, 160 deletions(-) delete mode 100644 modules/openstack_project/files/reprepro/debian-ceph-hammer-updates delete mode 100644 modules/openstack_project/files/reprepro/debian-ceph-jewel-updates delete mode 100644 modules/openstack_project/files/reprepro/debian-ceph-luminous-updates delete mode 100644 modules/openstack_project/files/reprepro/debian-ceph-mimic-updates delete mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb delete mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-jewel.erb delete mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-luminous.erb delete mode 100644 modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb diff --git a/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates b/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates deleted file mode 100644 index a8cbbc2e69..0000000000 --- a/modules/openstack_project/files/reprepro/debian-ceph-hammer-updates +++ /dev/null @@ -1,7 +0,0 @@ -Name: debian-ceph-hammer -Method: http://download.ceph.com/debian-hammer/ -Components: main -UDebComponents: main -Architectures: amd64 -GetInRelease: no -VerifyRelease: 460f3994 diff --git a/modules/openstack_project/files/reprepro/debian-ceph-jewel-updates b/modules/openstack_project/files/reprepro/debian-ceph-jewel-updates deleted file mode 100644 index 021796bde2..0000000000 --- a/modules/openstack_project/files/reprepro/debian-ceph-jewel-updates +++ /dev/null @@ -1,7 +0,0 @@ -Name: debian-ceph-jewel -Method: http://download.ceph.com/debian-jewel/ -Components: main -UDebComponents: main -Architectures: amd64 -GetInRelease: no -VerifyRelease: 460f3994 diff --git a/modules/openstack_project/files/reprepro/debian-ceph-luminous-updates b/modules/openstack_project/files/reprepro/debian-ceph-luminous-updates deleted file mode 100644 index 48394c6a7f..0000000000 --- a/modules/openstack_project/files/reprepro/debian-ceph-luminous-updates +++ /dev/null @@ -1,7 +0,0 @@ -Name: debian-ceph-luminous -Method: http://download.ceph.com/debian-luminous/ -Components: main -UDebComponents: main -Architectures: amd64 -GetInRelease: no -VerifyRelease: 460f3994 diff --git a/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates b/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates deleted file mode 100644 index ac1aaa84f2..0000000000 --- a/modules/openstack_project/files/reprepro/debian-ceph-mimic-updates +++ /dev/null @@ -1,7 +0,0 @@ -Name: debian-ceph-mimic -Method: http://download.ceph.com/debian-mimic/ -Components: main -UDebComponents: main -Architectures: amd64 -GetInRelease: no -VerifyRelease: 460f3994 diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 47169c949e..3dfea8cfdd 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -209,94 +209,6 @@ class openstack_project::mirror_update ( key_type => 'public', } - ::openstack_project::reprepro { 'debian-ceph-hammer-reprepro-mirror': - confdir => '/etc/reprepro/debian-ceph-hammer', - basedir => '/afs/.openstack.org/mirror/ceph-deb-hammer', - distributions => 'openstack_project/reprepro/distributions.debian-ceph-hammer.erb', - updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-hammer-updates', - releases => ['xenial'], - } - - cron { 'reprepro debian ceph hammer': - user => 'root', - hour => '*/2', - minute => fqdn_rand(45, 'debian-ceph-hammer'), - command => 'flock -n /var/run/reprepro/debian-ceph-hammer.lock reprepro-mirror-update /etc/reprepro/debian-ceph-hammer mirror.deb-hammer >>/var/log/reprepro/debian-ceph-hammer-mirror.log 2>&1', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - require => [ - File['/usr/local/bin/reprepro-mirror-update'], - File['/etc/afsadmin.keytab'], - File['/etc/reprepro.keytab'], - ::Openstack_project::Reprepro['debian-ceph-hammer-reprepro-mirror'], - ] - } - - ::openstack_project::reprepro { 'debian-ceph-jewel-reprepro-mirror': - confdir => '/etc/reprepro/debian-ceph-jewel', - basedir => '/afs/.openstack.org/mirror/ceph-deb-jewel', - distributions => 'openstack_project/reprepro/distributions.debian-ceph-jewel.erb', - updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-jewel-updates', - releases => ['xenial'], - } - - cron { 'reprepro debian ceph jewel': - user => 'root', - hour => '*/2', - minute => fqdn_rand(45, 'debian-ceph-jewel'), - command => 'flock -n /var/run/reprepro/debian-ceph-jewel.lock reprepro-mirror-update /etc/reprepro/debian-ceph-jewel mirror.deb-jewel >>/var/log/reprepro/debian-ceph-jewel-mirror.log 2>&1', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - require => [ - File['/usr/local/bin/reprepro-mirror-update'], - File['/etc/afsadmin.keytab'], - File['/etc/reprepro.keytab'], - ::Openstack_project::Reprepro['debian-ceph-jewel-reprepro-mirror'], - ] - } - - ::openstack_project::reprepro { 'debian-ceph-luminous-reprepro-mirror': - confdir => '/etc/reprepro/debian-ceph-luminous', - basedir => '/afs/.openstack.org/mirror/ceph-deb-luminous', - distributions => 'openstack_project/reprepro/distributions.debian-ceph-luminous.erb', - updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-luminous-updates', - releases => ['stretch', 'xenial'], - } - - cron { 'reprepro debian ceph luminous': - user => 'root', - hour => '*/2', - minute => fqdn_rand(45, 'debian-ceph-luminous'), - command => 'flock -n /var/run/reprepro/debian-ceph-luminous.lock reprepro-mirror-update /etc/reprepro/debian-ceph-luminous mirror.deb-luminous >>/var/log/reprepro/debian-ceph-luminous-mirror.log 2>&1', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - require => [ - File['/usr/local/bin/reprepro-mirror-update'], - File['/etc/afsadmin.keytab'], - File['/etc/reprepro.keytab'], - ::Openstack_project::Reprepro['debian-ceph-luminous-reprepro-mirror'], - ] - } - - ::openstack_project::reprepro { 'debian-ceph-mimic-reprepro-mirror': - confdir => '/etc/reprepro/debian-ceph-mimic', - basedir => '/afs/.openstack.org/mirror/ceph-deb-mimic', - distributions => 'openstack_project/reprepro/distributions.debian-ceph-mimic.erb', - updates_file => 'puppet:///modules/openstack_project/reprepro/debian-ceph-mimic-updates', - releases => ['stretch', 'xenial', 'bionic'], - } - - cron { 'reprepro debian ceph mimic': - user => 'root', - hour => '*/2', - minute => fqdn_rand(45, 'debian-ceph-mimic'), - command => 'flock -n /var/run/reprepro/debian-ceph-mimic.lock reprepro-mirror-update /etc/reprepro/debian-ceph-mimic mirror.deb-mimic >>/var/log/reprepro/debian-ceph-mimic-mirror.log 2>&1', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - require => [ - File['/usr/local/bin/reprepro-mirror-update'], - File['/etc/afsadmin.keytab'], - File['/etc/reprepro.keytab'], - ::Openstack_project::Reprepro['debian-ceph-mimic-reprepro-mirror'], - ] - } - ::openstack_project::reprepro { 'debian-ceph-nautilus-reprepro-mirror': confdir => '/etc/reprepro/debian-ceph-nautilus', basedir => '/afs/.openstack.org/mirror/ceph-deb-nautilus', diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb deleted file mode 100644 index 3cd7992d07..0000000000 --- a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-hammer.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% @releases.each do |release| -%> -Origin: Ceph Hammer -Codename: <%= release %> -Description: OpenStack Debian Ceph Hammer <%= release.capitalize %> mirror -Architectures: amd64 -Components: main -Contents: .gz -Update: debian-ceph-hammer -Log: <%= @logdir %>/debian-ceph-hammer-<%= release %>.log - -<% end -%> diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-jewel.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-jewel.erb deleted file mode 100644 index 0229712bc9..0000000000 --- a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-jewel.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% @releases.each do |release| -%> -Origin: Ceph Jewel -Codename: <%= release %> -Description: OpenStack Debian Ceph Jewel <%= release.capitalize %> mirror -Architectures: amd64 -Components: main -Contents: .gz -Update: debian-ceph-jewel -Log: <%= @logdir %>/debian-ceph-jewel-<%= release %>.log - -<% end -%> diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-luminous.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-luminous.erb deleted file mode 100644 index 90bc85e4c4..0000000000 --- a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-luminous.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% @releases.each do |release| -%> -Origin: Ceph Luminous -Codename: <%= release %> -Description: OpenStack Debian Ceph Luminous <%= release.capitalize %> mirror -Architectures: amd64 -Components: main -Contents: .gz -Update: debian-ceph-luminous -Log: <%= @logdir %>/debian-ceph-luminous-<%= release %>.log - -<% end -%> diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb b/modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb deleted file mode 100644 index 22e6680167..0000000000 --- a/modules/openstack_project/templates/reprepro/distributions.debian-ceph-mimic.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% @releases.each do |release| -%> -Origin: Ceph Mimic -Codename: <%= release %> -Description: OpenStack Debian Ceph Mimic <%= release.capitalize %> mirror -Architectures: amd64 -Components: main -Contents: .gz -Update: debian-ceph-mimic -Log: <%= @logdir %>/debian-ceph-mimic-<%= release %>.log - -<% end -%>