openstack/kolla-ansible
Code Issues Proposed changes

Merge "Create ironic-pxe container with ironic-base"

Browse Source
This commit is contained in:
Jenkins 2015-12-29 03:55:52 +00:00 committed by Gerrit Code Review
commit a5a5b3fd61
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@ -18,6 +18,7 @@ RUN apt-get install -y --no-install-recommends \
syslinux \ syslinux \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /tftpboot \ && mkdir -p /tftpboot \
&& chown -R ironic: /tftpboot \
&& cp /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32 /tftpboot && cp /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32 /tftpboot
{% endif %} {% endif %}