From 935c35e4cd34c34aa5d4f922ce20fcaf9a001b96 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 7 Jul 2015 13:27:32 -0400 Subject: [PATCH] Variablize the full iPXE binary The full ipxe binary has a different name on RedHat based based distributions, so we need to variablize the parameter and load the correct variable accordingly. Change-Id: Icc6f3229ed54544794b57fe26d5293724e392647 --- .../ironic-install/defaults/required_defaults_Debian.yml | 1 + .../ironic-install/defaults/required_defaults_RedHat.yml | 1 + playbooks/roles/ironic-install/tasks/create_tftpboot.yml | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml b/playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml index 37333820d..2afb4bcf5 100644 --- a/playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml +++ b/playbooks/roles/ironic-install/defaults/required_defaults_Debian.yml @@ -4,6 +4,7 @@ init_dest_dir: /etc/init/ init_ext: .conf syslinux_tftp_dir: /usr/lib/syslinux/ ipxe_dir: /usr/lib/ipxe/ +ipxe_full_binary: ipxe.pxe sgabios_dir: /usr/share/qemu/ nginx_user: www-data virt_group: libvirtd diff --git a/playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml b/playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml index 673e5b438..b87083fa2 100644 --- a/playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml +++ b/playbooks/roles/ironic-install/defaults/required_defaults_RedHat.yml @@ -4,6 +4,7 @@ init_dest_dir: /usr/lib/systemd/system/ init_ext: .service syslinux_tftp_dir: /var/lib/tftpboot ipxe_dir: /usr/share/ipxe/ +ipxe_full_binary: ipxe.lkrn sgabios_dir: /usr/share/sgabios/ nginx_user: nginx virt_group: libvirt diff --git a/playbooks/roles/ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/ironic-install/tasks/create_tftpboot.yml index 2b63a654a..4dfff4e78 100644 --- a/playbooks/roles/ironic-install/tasks/create_tftpboot.yml +++ b/playbooks/roles/ironic-install/tasks/create_tftpboot.yml @@ -39,9 +39,9 @@ copy: src={{ ipxe_dir }}/undionly.kpxe dest=/tftpboot/ # NOTE(TheJulia): Copy full iPXE chain loader images in case they are required. - name: "Copy full iPXE image into /httpboot" - copy: src={{ ipxe_dir }}/ipxe.pxe dest=/httpboot/ + copy: src={{ ipxe_dir }}/{{ ipxe_full_binary }} dest=/httpboot/ - name: "Copy full iPXE image into /tftpboot" - copy: src={{ ipxe_dir }}/ipxe.pxe dest=/tftpboot/ + copy: src={{ ipxe_dir }}/{{ ipxe_full_binary }} dest=/tftpboot/ # Similar logic to below can be utilized to retrieve files - name: "Determine if folder exists, else create and populate folder." stat: path=/tftpboot/master_images