From eba3018610df1ca5f91d8a9db930622c0b73e12d Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Wed, 23 Mar 2016 14:26:27 +0000
Subject: [PATCH] Add conntrack-tools

Conntrack is used by neutron as a dep, but not installed in the source
containers. This leads to errors in the log and in some cases network
instability.

Change-Id: Ie6eae7530bf4e378eedb852a16ed8595402113a6
Closes-Bug: #1561008
(cherry picked from commit 27975f8ab563a769d457111e64694906b2c8f1b1)
---
 docker/neutron/neutron-base/Dockerfile.j2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 2c036037ca..0c14587588 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -14,8 +14,8 @@ RUN yum -y install \
 
 RUN apt-get install -y --no-install-recommends \
         neutron-plugin-ml2 \
-        openvswitch-switch \
         neutron-server \
+        openvswitch-switch \
     && apt-get clean \
     && mkdir -p /usr/share/neutron \
     && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
@@ -25,16 +25,18 @@ RUN apt-get install -y --no-install-recommends \
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 RUN yum -y install \
-        uuid \
+        conntrack-tools \
         dnsmasq \
         ipset \
         openvswitch \
+        uuid \
     && yum clean all
 
     {% elif base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
         arping \
+        conntrack \
         dnsmasq \
         ipset \
         iptables \