openstack/kolla
Code Issues Proposed changes

install pxelinux for ironic_pxe

Browse Source 
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
This commit is contained in:
Waldemar Znoinski 2016-09-30 14:12:04 +00:00 committed by Jeffrey Zhang
parent cac300e0c8
commit 06422a29c9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -14,7 +14,8 @@ MAINTAINER {{ maintainer }}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'tftpd-hpa', 'tftpd-hpa',
'syslinux-common', 'syslinux-common',
'syslinux' 'syslinux',
'pxelinux'
] %} ] %}
{% endif %} {% endif %}

4
docker/ironic/ironic-pxe/extend_start.sh
View File

@ -4,7 +4,9 @@
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
chown -R ironic: /tftpboot 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 if [[ -e "$pxe_file" ]]; then
cp "$pxe_file" /tftpboot cp "$pxe_file" /tftpboot
fi fi