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