Skip to content

Commit 1c34653

Browse files
Christian BerendtJeffrey Zhang
Christian Berendt
authored and
Jeffrey Zhang
committed
Install keepalived in neutron_l3_agent container
L3 HA requires keepalived. It has to be installed when install_type is source. Change-Id: I3265b74490559ca9b22a19917a76925a55e32cdd Closes-bug: 1588829 (cherry picked from commit d511ee363be12c9d24929a6f02afef2e25031346)
1 parent 75b33e8 commit 1c34653

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

docker/neutron/neutron-l3-agent/Dockerfile.j2

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
22
MAINTAINER {{ maintainer }}
33

4-
{% if base_distro in ['ubuntu', 'debian'] %}
5-
{% if install_type == 'binary' %}
4+
{% if install_type == 'binary' %}
5+
{% if base_distro in ['ubuntu', 'debian'] %}
66

77
RUN apt-get install -y --no-install-recommends \
88
neutron-l3-agent \
99
&& apt-get clean
1010

11+
{% endif %}
12+
{% elif install_type == 'source' %}
13+
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
14+
15+
RUN yum -y install \
16+
keepalived \
17+
&& yum clean all
18+
19+
{% elif base_distro in ['ubuntu', 'debian'] %}
20+
21+
RUN apt-get -y install --no-install-recommends \
22+
keepalived \
23+
&& apt-get clean
24+
1125
{% endif %}
1226
{% endif %}
1327

0 commit comments

Comments
 (0)