diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-06-03 16:01:27 +0200 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-06-03 16:03:06 +0200 |
| commit | d511ee363be12c9d24929a6f02afef2e25031346 (patch) | |
| tree | 13ab047034b27986ea6db8b761cf5b1eaa10043c | |
| parent | 1ea24c88fbe9aec18d0497b282030ad3fda995f4 (diff) | |
| download | kolla-d511ee363be12c9d24929a6f02afef2e25031346.tar.gz kolla-d511ee363be12c9d24929a6f02afef2e25031346.zip | |
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
| -rw-r--r-- | docker/neutron/neutron-l3-agent/Dockerfile.j2 | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index a3edef6af..bf401540e 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -1,14 +1,28 @@ 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 %} {{ include_footer }} |