From 5993eda184102d739c6e9bb68ef1d998d878328a Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Tue, 25 Apr 2017 18:49:50 -0400 Subject: Fixing missing genisoimage in nova-compute-ironic When config drive is used when starting baremetal instance, it fails because of missing binary mkisofs. Change-Id: Ib142ca302458facfad99486ed89c2b3bb07d28c9 Closes-bug: #1686227 --- docker/nova/nova-compute-ironic/Dockerfile.j2 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 947d84257..e27e5b3b7 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -5,26 +5,31 @@ LABEL maintainer="{{ maintainer }}" {% import "macros.j2" as macros with context %} +{% set nova_compute_ironic_packages = ['genisoimage'] %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set nova_compute_ironic_packages = [ + {% set nova_compute_ironic_packages = nova_compute_ironic_packages + [ 'openstack-nova-compute' ] %} - {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set nova_compute_ironic_packages = [ + {% set nova_compute_ironic_packages = nova_compute_ironic_packages + [ 'nova-compute' ] %} - {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }} RUN rm /etc/nova/nova-compute.conf {% endif %} + +{% elif install_type == 'source' %} + +{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }} + {% endif %} {% block nova_compute_ironic_footer %}{% endblock %} -- cgit v1.2.3