openstack/kolla-ansible
Code Issues Proposed changes

Merge "install iptables in ironic-inspector container"

Browse Source
This commit is contained in:
Jenkins 2016-09-26 11:22:34 +00:00 committed by Gerrit Code Review
commit 1dd9fae441
1 changed files with 10 additions and 1 deletions

11
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 \