From 7640a231a84f87939d3242b062f4ca1e89bcfa4a Mon Sep 17 00:00:00 2001 From: Erik Berg Date: Sun, 10 Apr 2022 23:07:46 +0200 Subject: [PATCH] Allow for almalinux and rocky installations With the changes to bifrost-ironic-install required_defaults for the RedHat_family, we can now try to not get in the way of deploying on distros like almalinux and rocky. Fedora 32 has been EOL for close to a year, so we'll just assume firewalld for that case. Distributions RedHat, CentOS and Fedora are in the RedHat_family, so assume firewalld all distributions in the family. Change-Id: I1c8b768a3daf0af0d8e30d935558b6fdd912adfd --- playbooks/roles/bifrost-ironic-install/defaults/main.yml | 6 +----- scripts/install-deps.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index fa4591a8b..82f3f515a 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -56,11 +56,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}" internal_interface: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4'] }}" internal_ip: "{{ internal_interface['address'] }}" -# Fedora 30 did not use firewalld, 32 started relying on it. -use_firewalld: >- - {{ ansible_distribution in ['RedHat', 'CentOS'] - or (ansible_distribution == 'Fedora' - and ansible_distribution_major_version|int >= 32) }} +use_firewalld: "{{ ansible_os_family == 'RedHat' }}" # Our own firewalld zone, only applies when testing is false. firewalld_internal_zone: bifrost diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index ad917a3ea..6a0582290 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -71,7 +71,7 @@ case ${ID,,} in fi ;; - rhel|fedora|centos) + rhel|fedora|centos|almalinux|rocky) OS_FAMILY="RedHat" PKG_MANAGER=$(/usr/bin/which dnf || /usr/bin/which yum) if [[ "${BIFROST_TRACE:-}" != true ]]; then