openstack/bifrost
Code Issues Proposed changes

Allow for almalinux and rocky installations

Browse Source 
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
This commit is contained in:
Erik Berg 2022-04-10 23:07:46 +02:00
parent 3ed6ba0264
commit 7640a231a8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -56,11 +56,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}"
internal_interface: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4'] }}" internal_interface: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4'] }}"
internal_ip: "{{ internal_interface['address'] }}" internal_ip: "{{ internal_interface['address'] }}"
# Fedora 30 did not use firewalld, 32 started relying on it. use_firewalld: "{{ ansible_os_family == 'RedHat' }}"
use_firewalld: >-
{{ ansible_distribution in ['RedHat', 'CentOS']
or (ansible_distribution == 'Fedora'
and ansible_distribution_major_version|int >= 32) }}
# Our own firewalld zone, only applies when testing is false. # Our own firewalld zone, only applies when testing is false.
firewalld_internal_zone: bifrost firewalld_internal_zone: bifrost

2
scripts/install-deps.sh
View File

@ -71,7 +71,7 @@ case ${ID,,} in
fi fi
;; ;;
rhel|fedora|centos) rhel|fedora|centos|almalinux|rocky)
OS_FAMILY="RedHat" OS_FAMILY="RedHat"
PKG_MANAGER=$(/usr/bin/which dnf || /usr/bin/which yum) PKG_MANAGER=$(/usr/bin/which dnf || /usr/bin/which yum)
if [[ "${BIFROST_TRACE:-}" != true ]]; then if [[ "${BIFROST_TRACE:-}" != true ]]; then