diff options
| author | Özgür Caner <oc@teuto.net> | 2016-12-16 14:19:54 +0100 |
|---|---|---|
| committer | Özgür Caner <oc@teuto.net> | 2016-12-26 14:44:46 +0100 |
| commit | d46e9a2028fa681f8b4350159987fdea1d1880ed (patch) | |
| tree | c41340c9ea46db7c24900974c8c3041c61e48907 | |
| parent | f62b16f8a447b7c90da3844720a200fb4d3ef5d5 (diff) | |
| download | kolla-d46e9a2028fa681f8b4350159987fdea1d1880ed.tar.gz kolla-d46e9a2028fa681f8b4350159987fdea1d1880ed.zip | |
HA router fails using neutron-vpn-agent
Creating a HA Router on kolla newton using the neutron-vpn-agent
instead neutron-l3-agent fails because keepalived is missing in the
neutron-vpn-agent container image.
Change-Id: If64040a5c59a2f0778769473a590109a69fc10a8
Closes-Bug: #1650534
Signed-off-by: Özgür Caner <oc@teuto.net>
| -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")) }} |