openstack/kolla-ansible
Code Issues Proposed changes

install iptables in ironic-inspector container

Browse Source 
Change-Id: I5c153b367ef21eb76bc3fbe8bd724c71aa251f3c
Closes-bug: #1626539
This commit is contained in:
Waldemar Znoinski 2016-09-22 12:55:13 +00:00
parent 326327acba
commit 40ed2c46cd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,21 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_inspector_packages = ['ironic-inspector'] %} {% set ironic_inspector_packages = [
'ironic-inspector',
'iptables'
] %}
{% endif %} {% endif %}
{{ 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_distro in ['ubuntu'] %}
{% set ironic_inspector_packages = ['iptables'] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
ADD ironic-inspector-archive /ironic-inspector-source ADD ironic-inspector-archive /ironic-inspector-source
RUN ln -s ironic-inspector-source/* ironic-inspector \ RUN ln -s ironic-inspector-source/* ironic-inspector \
&& mv /etc/ironic /etc/ironic-inspector \ && mv /etc/ironic /etc/ironic-inspector \