diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-23 20:36:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-23 20:36:37 +0000 |
| commit | dbe0fd8fb9e58575cb1b70988926818e74270a09 (patch) | |
| tree | eac6850b070ba2af752189073d4ca53ff1fa7d84 /docker | |
| parent | 1eec9ba3c31d6638ca52eee7f459876bef651157 (diff) | |
| parent | d43c46def644e9bf32ca5c1ceaa0cb077ae3841c (diff) | |
| download | kolla-dbe0fd8fb9e58575cb1b70988926818e74270a09.tar.gz kolla-dbe0fd8fb9e58575cb1b70988926818e74270a09.zip | |
Merge "Install iptables in ironic-inspector container" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic-inspector/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index 3332bf93e..88e6d64b4 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -10,6 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set ironic_inspector_packages = [ + 'iptables', 'openstack-ironic-inspector', '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")) }} {% 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'] %} {% endif %} |