diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-27 13:51:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-27 13:51:38 +0000 |
| commit | c70cefe19cc3f18b906098a2e2dbc55a7b4dd34d (patch) | |
| tree | 99235c6726d66c204c63afa62b9243882a4aac24 | |
| parent | 4ee8f780511c44f436771228810a0ddd7fb2ddfa (diff) | |
| parent | 9da034dc0a5e66ceb585d9f747afd278eeb853ef (diff) | |
| download | kolla-c70cefe19cc3f18b906098a2e2dbc55a7b4dd34d.tar.gz kolla-c70cefe19cc3f18b906098a2e2dbc55a7b4dd34d.zip | |
Merge "Fix ironic-pxe map-file location"
| -rw-r--r-- | ansible/roles/ironic/templates/ironic-pxe.json.j2 | 2 | ||||
| -rw-r--r-- | 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 f8f1666e7..3fdf9d88b 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 72961d4b5..da2adbe5e 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 }} |