From d511ee363be12c9d24929a6f02afef2e25031346 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Fri, 3 Jun 2016 16:01:27 +0200
Subject: [PATCH] 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
---
docker/neutron/neutron-l3-agent/Dockerfile.j2 | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2
index a3edef6af0..bf401540ef 100644
--- a/docker/neutron/neutron-l3-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2
@@ -1,13 +1,27 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
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 \
neutron-l3-agent \
&& 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 %}