diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-26 19:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-26 19:46:45 +0000 |
| commit | 4433a95698da147f3eae8f12b526c2fc204b7a42 (patch) | |
| tree | 5524e4c4618caf79a49c6000c8886fd0490c929d /docker | |
| parent | f6a9198311208055e7b9b8fe49c78f95885f08df (diff) | |
| parent | 5993eda184102d739c6e9bb68ef1d998d878328a (diff) | |
| download | kolla-4433a95698da147f3eae8f12b526c2fc204b7a42.tar.gz kolla-4433a95698da147f3eae8f12b526c2fc204b7a42.zip | |
Merge "Fixing missing genisoimage in nova-compute-ironic"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 13 |
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 %} |