diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-22 17:53:52 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-11-04 07:43:57 +0000 |
| commit | 1a676a36e9e5ad772a0b06532babca13721227de (patch) | |
| tree | e2e425b0e6e1f7cd10156e42b9068f239d996d55 /docker | |
| parent | 32006d8149b68424a7a12171225ac914c30f16a6 (diff) | |
| download | kolla-1a676a36e9e5ad772a0b06532babca13721227de.tar.gz kolla-1a676a36e9e5ad772a0b06532babca13721227de.zip | |
Adjust package name for Ubuntu Ironic
We target 14.04 which has the package name 'syslinux'
>14.04 has the package name 'pxelinux'
TrivialFix
Backport: Liberty
Change-Id: Id0f4f503257d62d9ce45be5eb8f4faa766244d0a
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 %} |