diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-10 22:18:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-10 22:18:40 +0000 |
| commit | c07685935e3df5d0951149d7b617a06b4b7dda91 (patch) | |
| tree | 67653250335a8001a775bf9320381c77a72494f0 | |
| parent | a6b69d6dff4ed420e4852c39c68634e03e0dad02 (diff) | |
| parent | eaa0ae5716c1f3358a03989f33e7240949772e5f (diff) | |
| download | kolla-c07685935e3df5d0951149d7b617a06b4b7dda91.tar.gz kolla-c07685935e3df5d0951149d7b617a06b4b7dda91.zip | |
Merge "ironic-pxe: handle non-x86 architectures"
| -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 0eb3442ee..bfb23b0c4 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 %} |