openstack/kolla
Code Issues Proposed changes

Install keepalived in neutron_l3_agent container

Browse Source 
L3 HA requires keepalived. It has to be installed when install_type
is source.

Change-Id: I3265b74490559ca9b22a19917a76925a55e32cdd
Closes-bug: 1588829
This commit is contained in:
Christian Berendt 2016-06-03 16:01:27 +02:00
parent 1ea24c88fb
commit d511ee363b
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 %}