aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSerguei Bezverkhi <sbezverk@cisco.com>2017-04-25 18:49:50 -0400
committerSerguei Bezverkhi <sbezverk@cisco.com>2017-04-26 11:42:53 -0400
commit5993eda184102d739c6e9bb68ef1d998d878328a (patch)
tree840f91eaa123b40b4d20e6be7958c01c99bc3fd5 /docker
parenta486b18475541524dfd94aa28902e7c3ae0e1566 (diff)
downloadkolla-5993eda184102d739c6e9bb68ef1d998d878328a.tar.gz
kolla-5993eda184102d739c6e9bb68ef1d998d878328a.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/nova/nova-compute-ironic/Dockerfile.j213
1 files changed, 9 insertions, 4 deletions
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 %}