openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix ironic-pxe map-file location"

Browse Source
This commit is contained in:
Jenkins 2016-01-27 13:51:38 +00:00 committed by Gerrit Code Review
commit c70cefe19c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ironic/templates/ironic-pxe.json.j2
View File

@ -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": [] "config_files": []
} }

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

@ -23,6 +23,6 @@ RUN apt-get install -y --no-install-recommends \
{% endif %} {% endif %}
COPY tftp-map-file /tftpboot/map-file COPY tftp-map-file /map-file
{{ include_footer }} {{ include_footer }}