Skip to content

Commit cebecff

Browse files
committed
Remove CentOS Stream 8 leftovers
And yes, even some CentOS 7 ones Change-Id: I5df83ec54ecd7b8b363900d7ec7ada1ed9de0f5a
1 parent cd94708 commit cebecff

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

playbooks/roles/bifrost-create-vm-nodes/tasks/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
name: "{{ required_packages }}"
4242
state: present
4343

44-
# NOTE(dtantsur): workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1840485
45-
- name: "Work around libgrypt issue on RHEL/CentOS 8.3"
46-
package:
47-
name: libgcrypt
48-
state: latest
49-
when: ansible_distribution in ['RedHat', 'CentOS']
50-
5144
- name: ensure installation root folder exists
5245
become: yes
5346
file:

playbooks/roles/bifrost-ironic-install/defaults/main.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,7 @@ ipa_download_headers: {}
7777
ipa_kernel: "{{ http_boot_folder }}/ipa.kernel"
7878
ipa_ramdisk: "{{ http_boot_folder }}/ipa.initramfs"
7979
ipa_kernel_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/ipa.kernel"
80-
ipa_download_distro: >-
81-
{%- if ipa_upstream_release == "stable-train" -%}
82-
centos7
83-
{%- elif ipa_upstream_release in ["stable-ussuri", "stable-victoria", "stable-wallaby", "stable-xena", "stable-yoga"] -%}
84-
centos8
85-
{%- else -%}
86-
centos9
87-
{%- endif -%}
80+
ipa_download_distro: centos9
8881
ipa_kernel_upstream_url: >-
8982
{%- if use_tinyipa | bool -%}
9083
{{ tarballs_base_url }}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz
@@ -146,10 +139,6 @@ deploy_image_sources:
146139
checksum: "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/CHECKSUM"
147140
checksum_algorithm: "sha256"
148141
centos:
149-
8-stream:
150-
image: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20230501.0.x86_64.qcow2"
151-
checksum: "https://cloud.centos.org/centos/8-stream/x86_64/images/CHECKSUM"
152-
checksum_algorithm: "sha256"
153142
9-stream:
154143
image: "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230501.0.x86_64.qcow2"
155144
checksum: "https://cloud.centos.org/centos/9-stream/x86_64/images/CHECKSUM"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
Completely remove CentOS Stream 8 support since it's now EoL.

scripts/test-bifrost.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if which setenforce &> /dev/null; then
7575
fi
7676

7777
if [ ${DOWNLOAD_CUSTOM_DEPLOY_IMAGE} = "true" ] && [ ! -f "$HOME/.ssh/id_ecdsa.pub" ]; then
78-
# CentOS/RHEL 8 and 9, as well as Fedora, do not work with the RSA key
78+
# CentOS/RHEL 9, as well as Fedora, do not work with the RSA key
7979
# that the Cirros' SSH server uses. Generate an ECDSA key pair instead.
8080
ssh-keygen -t ECDSA -f "$HOME/.ssh/id_ecdsa" -N ""
8181
fi

0 commit comments

Comments
 (0)