diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 11:22:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 11:22:34 +0000 |
| commit | 1dd9fae441f3375aa6684abf1a80ee8fcb195fcb (patch) | |
| tree | b9939d3bf74ee54b4faf6d31ac1ba7b2be0b91fd /docker | |
| parent | de2437ed4c0eec3459dea1edb6457a54008a0656 (diff) | |
| parent | 40ed2c46cddd1e813ffc077359b465ba1aef5229 (diff) | |
| download | kolla-1dd9fae441f3375aa6684abf1a80ee8fcb195fcb.tar.gz kolla-1dd9fae441f3375aa6684abf1a80ee8fcb195fcb.zip | |
Merge "install iptables in ironic-inspector container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 2f51273f7..2f6bac12b 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -9,12 +9,21 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% elif base_distro in ['ubuntu'] %} - {% set ironic_inspector_packages = ['ironic-inspector'] %} + {% set ironic_inspector_packages = [ + 'ironic-inspector', + 'iptables' + ] %} {% endif %} {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} {% elif install_type == 'source' %} + {% if base_distro in ['ubuntu'] %} + {% set ironic_inspector_packages = ['iptables'] %} + {% endif %} + +{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} + ADD ironic-inspector-archive /ironic-inspector-source RUN ln -s ironic-inspector-source/* ironic-inspector \ && mv /etc/ironic /etc/ironic-inspector \ |