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

@@ -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
 

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