diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-11 22:52:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-11 22:52:49 +0000 |
| commit | 35917e34be26a27f04027b64f2fe5314a0a65b76 (patch) | |
| tree | 53bb3bf97bd69db84eeade03e12d79b997dc7674 | |
| parent | ab6e2ebac6cdce3a2e3de533c99aaa6773ff129e (diff) | |
| parent | 6345313d17349615a9c62bec279f036d8630d0b8 (diff) | |
| download | kolla-35917e34be26a27f04027b64f2fe5314a0a65b76.tar.gz kolla-35917e34be26a27f04027b64f2fe5314a0a65b76.zip | |
Merge "Add missing files in ironic containers"
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | 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 fac65c930..cd16a2ea2 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 0f5fcd679..ce43ec378 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 |