From 40ed2c46cddd1e813ffc077359b465ba1aef5229 Mon Sep 17 00:00:00 2001 From: Waldemar Znoinski Date: Thu, 22 Sep 2016 12:55:13 +0000 Subject: [PATCH] install iptables in ironic-inspector container Change-Id: I5c153b367ef21eb76bc3fbe8bd724c71aa251f3c Closes-bug: #1626539 --- docker/ironic/ironic-inspector/Dockerfile.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 2f51273f75..2f6bac12bd 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 \