From 9da034dc0a5e66ceb585d9f747afd278eeb853ef Mon Sep 17 00:00:00 2001 From: Andrey Shestakov Date: Fri, 15 Jan 2016 11:21:32 +0200 Subject: [PATCH] Fix ironic-pxe map-file location map-file should not be overwriten by volume TrivialFix Change-Id: I57bf963fd4af8c010fda0c4504e83dc33f6e9162 --- ansible/roles/ironic/templates/ironic-pxe.json.j2 | 2 +- docker/ironic/ironic-pxe/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ironic/templates/ironic-pxe.json.j2 b/ansible/roles/ironic/templates/ironic-pxe.json.j2 index f8f1666e7b..3fdf9d88bd 100644 --- a/ansible/roles/ironic/templates/ironic-pxe.json.j2 +++ b/ansible/roles/ironic/templates/ironic-pxe.json.j2 @@ -1,4 +1,4 @@ { - "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /tftpboot/map-file /tftpboot", + "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot", "config_files": [] } diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 72961d4b5a..da2adbe5e5 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -23,6 +23,6 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -COPY tftp-map-file /tftpboot/map-file +COPY tftp-map-file /map-file {{ include_footer }}