openstack/kolla-ansible
Code Issues Proposed changes

Add missing files in ironic containers

Browse Source 
Added missing package for qemu-img in centos container
Added pxelinux.0 in ironic-pxe in centos container

TrivialFix

Change-Id: I706284824f915caf974b1247520c3e4025c47f57
This commit is contained in:
Andrey Shestakov 2016-03-11 16:10:28 +02:00
parent 19bdb0934e
commit 6345313d17
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -4,7 +4,9 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-ironic-conductor \ RUN yum -y install \
openstack-ironic-conductor \
qemu-img \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -19,7 +21,9 @@ RUN apt-get install -y --no-install-recommends \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install ipmitool \ RUN yum -y install \
qemu-img \
ipmitool \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}

2
docker/ironic/ironic-pxe/extend_start.sh
View File

@ -4,7 +4,7 @@
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
chown -R ironic: /tftpboot chown -R ironic: /tftpboot
for pxe_file in /var/lib/tftpboot/chain.c32 /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32; do for pxe_file in /var/lib/tftpboot/pxelinux.0 /var/lib/tftpboot/chain.c32 /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32; do
if [[ -e "$pxe_file" ]]; then if [[ -e "$pxe_file" ]]; then
cp "$pxe_file" /tftpboot cp "$pxe_file" /tftpboot
fi fi