diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-29 17:17:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-29 17:17:11 +0000 |
| commit | e18678c65c2694665562d691403831c0bb7b3101 (patch) | |
| tree | 301fcf8f10c00ab3f5a0da2a201fbf341b0e29d3 /docker | |
| parent | 34f2387ca8c844222da23b0a31b454270cacfec6 (diff) | |
| parent | d46e9a2028fa681f8b4350159987fdea1d1880ed (diff) | |
| download | kolla-e18678c65c2694665562d691403831c0bb7b3101.tar.gz kolla-e18678c65c2694665562d691403831c0bb7b3101.zip | |
Merge "HA router fails using neutron-vpn-agent"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/neutron/neutron-l3-agent/Dockerfile.j2 | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 71cad931a..480ee2c3d 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -9,6 +9,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set neutron_base_packages = [ + 'keepalived', 'openstack-neutron', 'openstack-neutron-lbaas', 'openstack-neutron-ml2', @@ -20,6 +21,7 @@ MAINTAINER {{ maintainer }} {% set neutron_base_packages = [ 'iproute2', + 'keepalived', 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', @@ -46,6 +48,7 @@ RUN mkdir -p /usr/share/neutron \ 'dnsmasq', 'dnsmasq-utils', 'ipset', + 'keepalived', 'openvswitch', 'python-openvswitch', 'uuid' @@ -61,6 +64,7 @@ RUN mkdir -p /usr/share/neutron \ 'ipset', 'iptables', 'iputils-arping', + 'keepalived', 'openvswitch-switch', 'python-openvswitch', 'uuid-runtime' diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index 235ced6a3..322d0817a 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -13,13 +13,6 @@ MAINTAINER {{ maintainer }} ] %} {% endif %} - -{% elif install_type == 'source' %} - - {% set neutron_l3_agent_packages = [ - 'keepalived' - ] %} - {% endif %} {{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }} |