From 56d24970fa81ae46052cccdaa29b8a9e4b06694b Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Mon, 28 Dec 2015 19:55:34 +0200
Subject: [PATCH] Create ironic-pxe container with ironic-base
/tftpboot directory should be writeable by ironic-conductor.
TrivialFix
Change-Id: I870a786d41a6feb8e0786b6e86a5caf1f9ceb079
---
docker/ironic/ironic-pxe/Dockerfile.j2 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index b550be051f..72961d4b5a 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 %}