diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-22 07:54:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-22 07:54:11 +0000 |
| commit | 2c8ae3ff53fb9506455ae917802efcebe0687978 (patch) | |
| tree | 3e576e972abf0b4bfdcbfcd51601a577e40f4986 /docker | |
| parent | 3438918d13e3cca4ab65a4bce5cf2a2aedbedc01 (diff) | |
| parent | ad1b8e20dfc6f743f1945b9e036cf29597b79053 (diff) | |
| download | kolla-2c8ae3ff53fb9506455ae917802efcebe0687978.tar.gz kolla-2c8ae3ff53fb9506455ae917802efcebe0687978.zip | |
Merge "Install iptables in ironic-inspector container"
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 5d08f3b9f..287b4956a 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -12,6 +12,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' ] %} @@ -25,7 +26,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 %} |