diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-04 04:07:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-04 04:07:28 +0000 |
| commit | 5fcb01d807e472e6c63599d17874a15c621d5096 (patch) | |
| tree | 27a006f55a30694c82ec188794717cc4ea6a9766 | |
| parent | 734cfd02c305a1df6baf320720c6df2a2c543f28 (diff) | |
| parent | 06422a29c9435d932c63365d3b7c68977851c01a (diff) | |
| download | kolla-5fcb01d807e472e6c63599d17874a15c621d5096.tar.gz kolla-5fcb01d807e472e6c63599d17874a15c621d5096.zip | |
Merge "install pxelinux for ironic_pxe"
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | 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 1545ca410..6150a646f 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 02ee5480a..3a83c69d4 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 |