Simplify bifrost-ironic-install required_defaults

removing required_defaults_RedHat.yml;
efi_distro seems to only get used for grub_config_path, and 'rhel'
is not the correct path on my UEFI rhel8 system. It's 'redhat', and
according to the only documentation [1] I found on a quick search,
it's probably been this since EL6. Which means we can use
'redhat' all over the board.

The unique values in efi_distro, grub_efi_binary and shim_efi_binary
correspond to ansible_facts['distribution'], which holds true for
centos and fedora aswell, so we can put all these in RedHat_family

removing required_defaults_CentOS.yml;
The common values from required_defaults_RedHat_family.yml should
suffice.

removing required_defaults_Fedora.yml;
Support for fedora has been deprecated [2], but since it's in the
os_family of redhat, we're only missing 'qemu-kvm' and
'policycoreutils-python-utils' from 'required_packages', so
deployment will probably still work.

[1] https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/installation_guide/s2-grub-whatis-booting-uefi
[2] https://review.opendev.org/c/openstack/bifrost/+/818780

Change-Id: Ieb35391fae5bd24ab420dc4239117e045f8b35ed
This commit is contained in:
Erik Berg 2022-04-10 16:31:34 +02:00
parent e5f928ee46
commit 3ed6ba0264
4 changed files with 3 additions and 48 deletions

View File

@ -1,4 +0,0 @@
---
efi_distro: centos
grub_efi_binary: /boot/efi/EFI/centos/grubx64.efi
shim_efi_binary: /boot/efi/EFI/centos/shimx64.efi

View File

@ -1,40 +0,0 @@
---
init_dest_dir: /usr/lib/systemd/system/
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ironic_rootwrap_dir: /usr/bin/
mysql_service_name: mariadb
tftp_service_name: tftp
efi_distro: fedora
grub_efi_binary: /boot/efi/EFI/fedora/grubx64.efi
shim_efi_binary: /boot/efi/EFI/fedora/shimx64.efi
required_packages:
- dnsmasq
- firewalld
- gcc
- xorriso
- grub2-efi-x64
- httpd-tools
- ipmitool
- ipxe-bootimgs
- kpartx
- libffi-devel
- libxml2-devel
- libxslt-devel
- mariadb-server
- openssl-devel
- parted
- policycoreutils-python-utils
- psmisc
- python3-devel
- python3-iniparse
- python3-libselinux
- python3-policycoreutils
- python3-PyMySQL
- qemu-img
- qemu-kvm
- shim-x64
- socat
- syslinux-nonlinux
- wget
- dosfstools

View File

@ -1,4 +0,0 @@
---
efi_distro: rhel
grub_efi_binary: /boot/efi/EFI/redhat/grubx64.efi
shim_efi_binary: /boot/efi/EFI/redhat/shimx64.efi

View File

@ -6,6 +6,9 @@ ipxe_efi_binary: ipxe-x86_64.efi
ironic_rootwrap_dir: /usr/bin/
mysql_service_name: mariadb
tftp_service_name: tftp
efi_distro: "{{ ansible_facts['distribution'] | lower }}"
grub_efi_binary: "/boot/efi/EFI/{{ efi_distro }}/grubx64.efi"
shim_efi_binary: "/boot/efi/EFI/{{ efi_distro }}/shimx64.efi"
required_packages:
- mariadb-server
- dnsmasq