diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index fac65c93016375ad2515bd2d1b0309d7bad91897..cd16a2ea2509511c4c92ee329b889525c7e33398 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 0f5fcd679b76910c8ef255d1bd94701db3b7970c..ce43ec378594e4ce955e618fdb17429e4eab215a 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