diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-03 19:54:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-03 19:54:56 +0000 |
| commit | eaf605c64cf7921e30b98368a84c15775942b966 (patch) | |
| tree | 0dec200dcea687feeee561cce07fddfd4997bd48 /docker | |
| parent | 55967130fd4ce381d0be1184533e68c2451ce5ba (diff) | |
| parent | d511ee363be12c9d24929a6f02afef2e25031346 (diff) | |
| download | kolla-eaf605c64cf7921e30b98368a84c15775942b966.tar.gz kolla-eaf605c64cf7921e30b98368a84c15775942b966.zip | |
Merge "Install keepalived in neutron_l3_agent container"
Diffstat (limited to 'docker')
| -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 }} |