diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-05 09:20:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-05 09:20:35 +0000 |
| commit | 15bcd372c51b26cb64a72201b75d89ae636ad3a9 (patch) | |
| tree | 133e559379c4bc6e01c5e4d89db1d2e792f6c475 /docker | |
| parent | cf79c8a6f5ce6dc5e6ed0a421056a59e1994746d (diff) | |
| parent | 1a676a36e9e5ad772a0b06532babca13721227de (diff) | |
| download | kolla-15bcd372c51b26cb64a72201b75d89ae636ad3a9.tar.gz kolla-15bcd372c51b26cb64a72201b75d89ae636ad3a9.zip | |
Merge "Adjust package name for Ubuntu Ironic"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index cf0604052..0ce6a8780 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -12,13 +12,13 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install --no-install-recommends \ +RUN apt-get install -y --no-install-recommends \ tftpd-hpa \ syslinux-common \ - pxelinux \ + syslinux \ && apt-get clean \ && mkdir -p /tftpboot \ - && cp /usr/lib/syslinux/pxelinux.0 /var/lib/tftpboot/chain.c32 /tftpboot + && cp /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32 /tftpboot {% endif %} |