From eec09486a37299edb7c18b8d3345c164c338ba55 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Fri, 8 Apr 2016 23:45:50 +0800
Subject: [PATCH] Fix launch vm failed in neutron-linuxbridge-agent env

Fix following two issues

* neutron-linuxbridge-agent container lacks bridge-utils package
* neutron-dhcp-agent container lacks dnsmasq-utils

Co-Authored-By: Manjeet Singh Bhatia <manjeet.s.bhatia@intel.com>
Closes-Bug: #1567406
Change-Id: I93a445b06612671f0331cd94573da41d2d3b60a0
---
 docker/neutron/neutron-base/Dockerfile.j2              |  2 ++
 docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 0c14587588..f8a9f9f5b6 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -27,6 +27,7 @@ RUN apt-get install -y --no-install-recommends \
 RUN yum -y install \
         conntrack-tools \
         dnsmasq \
+        dnsmasq-utils \
         ipset \
         openvswitch \
         uuid \
@@ -38,6 +39,7 @@ RUN apt-get install -y --no-install-recommends \
         arping \
         conntrack \
         dnsmasq \
+        dnsmasq-utils \
         ipset \
         iptables \
         openvswitch-switch \
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 0abb054478..0635151d7f 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -22,9 +22,17 @@ RUN apt-get install -y --no-install-recommends \
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 # Install required packages
-RUN yum install -y ebtables \
+RUN yum install -y \
+        ebtables \
+        bridge-utils \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+RUN apt-get install -y \
+        ebtables \
+        bridge-utils \
+    && apt-get clean
+
     {% endif %}
 {% endif %}