openstack
/
kolla
Code Issues Proposed changes

Merge "Install iptables in ironic-inspector container" into stable/train

This commit is contained in:
Zuul 2020-12-23 20:36:37 +00:00 committed by Gerrit Code Review
parent 1eec9ba3c3 d43c46def6
commit dbe0fd8fb9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/ironic-inspector/Dockerfile.j2
View File

@ -10,6 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = [ {% set ironic_inspector_packages = [
'iptables',
'openstack-ironic-inspector', 'openstack-ironic-inspector',
'openstack-ironic-inspector-dnsmasq' 'openstack-ironic-inspector-dnsmasq'
] %} ] %}
@ -23,7 +24,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'deb' %} {% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = ['iptables'] %}
{% elif base_package_type == 'deb' %}
{% set ironic_inspector_packages = ['iptables'] %} {% set ironic_inspector_packages = ['iptables'] %}
{% endif %} {% endif %}