From 06422a29c9435d932c63365d3b7c68977851c01a Mon Sep 17 00:00:00 2001 From: Waldemar Znoinski Date: Fri, 30 Sep 2016 14:12:04 +0000 Subject: [PATCH] install pxelinux for ironic_pxe pxelinux.0 and chain.c32 files are provided by two separate packages on xenial compared to 1 on trusty. This change adds the required package to be installed and new paths the files reside on xenial. Change-Id: I48a3622f7257f4cbf994258f82ba91947aae3be4 Closes-bug: #1629337 --- docker/ironic/ironic-pxe/Dockerfile.j2 | 3 ++- docker/ironic/ironic-pxe/extend_start.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 1545ca4102..6150a646f8 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -14,7 +14,8 @@ MAINTAINER {{ maintainer }} {% set ironic_pxe_packages = [ 'tftpd-hpa', 'syslinux-common', - 'syslinux' + 'syslinux', + 'pxelinux' ] %} {% endif %} diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index 02ee5480af..3a83c69d44 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -4,7 +4,9 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then chown -R ironic: /tftpboot - for pxe_file in /var/lib/tftpboot/pxelinux.0 /var/lib/tftpboot/chain.c32 /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32; do + for pxe_file in /var/lib/tftpboot/pxelinux.0 /var/lib/tftpboot/chain.c32 /usr/lib/syslinux/pxelinux.0 \ + /usr/lib/syslinux/chain.c32 /usr/lib/PXELINUX/pxelinux.0 \ + /usr/lib/syslinux/modules/bios/chain.c32; do if [[ -e "$pxe_file" ]]; then cp "$pxe_file" /tftpboot fi