openstack/kolla-ansible
Code Issues Proposed changes

Merge "Install keepalived in neutron_l3_agent container"

Browse Source
This commit is contained in:
Jenkins 2016-06-03 19:54:56 +00:00 committed by Gerrit Code Review
commit eaf605c64c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/neutron/neutron-l3-agent/Dockerfile.j2
View File

@ -1,13 +1,27 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if base_distro in ['ubuntu', 'debian'] %} {% if install_type == 'binary' %}
{% if install_type == 'binary' %} {% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \ RUN apt-get -y install --no-install-recommends \
neutron-l3-agent \ neutron-l3-agent \
&& apt-get clean && apt-get clean
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
keepalived \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \
keepalived \
&& apt-get clean
{% endif %} {% endif %}
{% endif %} {% endif %}