openstack/kolla
Code Issues Proposed changes

Merge "Fixing missing genisoimage in nova-compute-ironic"

Browse Source
This commit is contained in:
Jenkins
2017-04-26 19:46:45 +00:00
committed by Gerrit Code Review
parent f6a9198311 5993eda184
commit 4433a95698
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docker/nova/nova-compute-ironic/Dockerfile.j2
View File

@@ -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 %}