diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-21 10:16:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-21 10:16:17 +0000 |
| commit | d6acc352e3bb7b2f5a4d485794cf2ee89b521980 (patch) | |
| tree | c6b310b15f843b3b1d1b2247bb358fe0c46b7ea5 | |
| parent | 163dbc017fe3ab647bb73308bdd913953fa77f39 (diff) | |
| parent | 2b41f2ba40aa217451bd9d60899c07f01382c39f (diff) | |
| download | kolla-d6acc352e3bb7b2f5a4d485794cf2ee89b521980.tar.gz kolla-d6acc352e3bb7b2f5a4d485794cf2ee89b521980.zip | |
Merge "syslinux package is only built for x86_64"
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | releasenotes/notes/ironic_syslinux-70eac225d227dc2e.yaml | 4 |
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. |