openstack/kolla-ansible
Code Issues Proposed changes

Adjust package name for Ubuntu Ironic

Browse Source 
We target 14.04 which has the package name 'syslinux'
>14.04 has the package name 'pxelinux'

TrivialFix
Backport: Liberty
Change-Id: Id0f4f503257d62d9ce45be5eb8f4faa766244d0a
This commit is contained in:
Sam Yaple 2015-10-22 17:53:52 +00:00
parent 32006d8149
commit 1a676a36e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,13 +12,13 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
tftpd-hpa \ tftpd-hpa \
syslinux-common \ syslinux-common \
pxelinux \ syslinux \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /tftpboot \ && 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 %} {% endif %}