diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-02-16 12:11:53 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-06 09:45:29 +0200 |
| commit | eaa0ae5716c1f3358a03989f33e7240949772e5f (patch) | |
| tree | b433824113b1bd7799c17d383e744b1a2199d485 /docker/ironic | |
| parent | 0b6b2c40dd320f4a21a2e5acd8a33b8e4f0cf691 (diff) | |
| download | kolla-eaa0ae5716c1f3358a03989f33e7240949772e5f.tar.gz kolla-eaa0ae5716c1f3358a03989f33e7240949772e5f.zip | |
ironic-pxe: handle non-x86 architectures
'syslinux' is built only for x86 architectures
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I6fa78fd4e301649acd085b84d71047a207277927
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 577200392..b9608accf 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -23,10 +23,16 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'ipxe', 'libapache2-mod-wsgi', 'pxelinux', - 'syslinux', 'syslinux-common', 'tftpd-hpa' ] %} + + {% if base_arch == 'x86_64' %} + {% set ironic_pxe_packages = ironic_pxe_packages + [ + 'syslinux' + ] %} + {% endif %} + {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf {% endif %} |