summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hamzy <hamzy@us.ibm.com>2018-02-15 13:25:52 -0600
committerMark Hamzy <hamzy@us.ibm.com>2018-02-15 19:08:39 -0600
commit2b41f2ba40aa217451bd9d60899c07f01382c39f (patch)
tree53f701fd5b802f8512dcfa20bacf6095d5175729
parent9735112313bd23d74274c70f08207a192db994fc (diff)
downloadkolla-2b41f2ba40aa217451bd9d60899c07f01382c39f.tar.gz
kolla-2b41f2ba40aa217451bd9d60899c07f01382c39f.zip
syslinux package is only built for x86_64
The syslinux package is only built for x86_64 and not for ppc64le or aarch64. Change-Id: I773e6ddf20ba2030fdeeb1ee66e79f20f82168aa Closes-Bug: 1749780
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j27
-rw-r--r--releasenotes/notes/ironic_syslinux-70eac225d227dc2e.yaml4
2 files changed, 10 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index ada4b0e83..28dcb5361 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -11,10 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ipxe-bootimgs',
'mod_ssl',
'mod_wsgi',
- 'syslinux-tftpboot',
'tftp-server'
] %}
+ {% if base_arch == 'x86_64' %}
+ {% set ironic_pxe_packages = ironic_pxe_packages + [
+ 'syslinux-tftpboot'
+ ] %}
+ {% endif %}
+
{% if base_arch == 'aarch64' %}
ENV ironic_arch=aarch64
{% set ironic_pxe_packages = ironic_pxe_packages + [
diff --git a/releasenotes/notes/ironic_syslinux-70eac225d227dc2e.yaml b/releasenotes/notes/ironic_syslinux-70eac225d227dc2e.yaml
new file mode 100644
index 000000000..400c88b81
--- /dev/null
+++ b/releasenotes/notes/ironic_syslinux-70eac225d227dc2e.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+ - |
+ The syslinux package is only built for x86_64 and not for ppc64le or aarch64.