| commit | 861727e207d3676dc9ce553031e3924e9af0d1af | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Thu Aug 31 10:14:52 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@b3fef64565ee> | Thu Aug 31 10:14:53 2017 +0000 |
| tree | c12dbcd98d0ddb24afea133d2d128bba25a37d75 | |
| parent | 509c900b5665e421948e3c52c357875828be5679 [diff] | |
| parent | e584571f9142ff86d93cb0ff62e6fc36d855e01c [diff] |
Merge "Add ldlinux.c32"
diff --git a/ironic/conductor.sls b/ironic/conductor.sls index b8baa13..6f65a4c 100644 --- a/ironic/conductor.sls +++ b/ironic/conductor.sls
@@ -61,8 +61,8 @@ file.managed: - name: {{ conductor.tftp_root }}/map-file - contents: | - r ^([^/]) {{ conductor.tftp_root }}/\\1 - r ^(/tftpboot/) {{ conductor.tftp_root }}/\2 + r ^[^/] /\0 + r ^({{ conductor.tftp_root }}) /\2 - user: 'ironic' - group: 'ironic' - require: