From 6345313d17349615a9c62bec279f036d8630d0b8 Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Fri, 11 Mar 2016 16:10:28 +0200
Subject: [PATCH] Add missing files in ironic containers

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

TrivialFix

Change-Id: I706284824f915caf974b1247520c3e4025c47f57
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 8 ++++++--
 docker/ironic/ironic-pxe/extend_start.sh     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index fac65c9301..cd16a2ea25 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -4,7 +4,9 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% 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
 
     {% elif base_distro in ['ubuntu'] %}
@@ -19,7 +21,9 @@ RUN apt-get install -y --no-install-recommends \
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install ipmitool \
+RUN yum -y install \
+        qemu-img \
+        ipmitool \
     && yum clean all
 
     {% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh
index 0f5fcd679b..ce43ec3785 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/docker/ironic/ironic-pxe/extend_start.sh
@@ -4,7 +4,7 @@
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     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
             cp "$pxe_file" /tftpboot
         fi