From 33f21f44166f1c13b5c88c33ce763bdcbf24964e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 6 Feb 2024 19:18:06 +0900 Subject: [PATCH] Remove CentOS 8/Debian 10 support stable/yoga and older branches are transitioning to EOL, so we no longer have active branches which support CentOS 8 or Debian 10. Change-Id: Ie8a9fbac392ec8f2383ffef836f141ae1d713e93 --- manifests/repo.pp | 7 +------ metadata.json | 3 --- .../remove-centos8-and-debian10-dd7544d398df296d.yaml | 4 ++++ spec/classes/ceph_repo_spec.rb | 6 +----- 4 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-centos8-and-debian10-dd7544d398df296d.yaml diff --git a/manifests/repo.pp b/manifests/repo.pp index 244db54a..c8fa8cd3 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -118,12 +118,7 @@ not on ${facts['os']['name']}, which can lead to packaging issues.") if $ceph_mirror { $ceph_mirror_real = $ceph_mirror } else { - # NOTE(tobias-urdin): mirror.centos.org doesnt have https support - if versioncmp($el, '9') >= 0 { - $centos_mirror = 'https://mirror.stream.centos.org/SIGs' - } else { - $centos_mirror = 'http://mirror.centos.org/centos' - } + $centos_mirror = 'https://mirror.stream.centos.org/SIGs' $ceph_mirror_real = "${centos_mirror}/${el}-stream/storage/x86_64/ceph-${release}/" } yumrepo { 'ceph-storage-sig': diff --git a/metadata.json b/metadata.json index 292dfc44..d2d2f7f9 100644 --- a/metadata.json +++ b/metadata.json @@ -17,7 +17,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11", "12" ] @@ -25,14 +24,12 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "8", "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "8", "9" ] }, diff --git a/releasenotes/notes/remove-centos8-and-debian10-dd7544d398df296d.yaml b/releasenotes/notes/remove-centos8-and-debian10-dd7544d398df296d.yaml new file mode 100644 index 00000000..3f66bfe2 --- /dev/null +++ b/releasenotes/notes/remove-centos8-and-debian10-dd7544d398df296d.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + CentOS 8, RHEL 8 and Debian 10 are no longer supported. diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 317fa6fb..fabe2bd0 100644 --- a/spec/classes/ceph_repo_spec.rb +++ b/spec/classes/ceph_repo_spec.rb @@ -417,11 +417,7 @@ describe 'ceph::repo' do if facts[:os]['name'] == 'CentOS' let (:platform_params) do - if facts[:os]['release']['major'].to_i >= 9 - { :centos_mirror => 'https://mirror.stream.centos.org/SIGs' } - else - { :centos_mirror => 'http://mirror.centos.org/centos' } - end + { :centos_mirror => 'https://mirror.stream.centos.org/SIGs' } end it_behaves_like 'ceph::repo on CentOS' end