From d46e9a2028fa681f8b4350159987fdea1d1880ed Mon Sep 17 00:00:00 2001
From: Özgür Caner <oc@teuto.net>
Date: Fri, 16 Dec 2016 14:19:54 +0100
Subject: HA router fails using neutron-vpn-agent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 docker/neutron/neutron-base/Dockerfile.j2     | 4 ++++
 docker/neutron/neutron-l3-agent/Dockerfile.j2 | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'docker')

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")) }}
-- 
cgit v1.2.3