aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Shestakov <ashestakov@mirantis.com>2015-12-28 19:55:34 +0200
committerAndrey Shestakov <ashestakov@mirantis.com>2015-12-28 19:55:34 +0200
commit56d24970fa81ae46052cccdaa29b8a9e4b06694b (patch)
treed0c302c970928f474063a346f7420a0752db24c8
parentc5c5c6e444287323a13c0558ac673ce21d9e3bb2 (diff)
downloadkolla-56d24970fa81ae46052cccdaa29b8a9e4b06694b.tar.gz
kolla-56d24970fa81ae46052cccdaa29b8a9e4b06694b.zip
Create ironic-pxe container with ironic-base
/tftpboot directory should be writeable by ironic-conductor. TrivialFix Change-Id: I870a786d41a6feb8e0786b6e86a5caf1f9ceb079
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index b550be051..72961d4b5 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@@ -18,6 +18,7 @@ RUN apt-get install -y --no-install-recommends \
syslinux \
&& apt-get clean \
&& mkdir -p /tftpboot \
+ && chown -R ironic: /tftpboot \
&& cp /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32 /tftpboot
{% endif %}