Merge "Fix launch vm failed in neutron-linuxbridge-agent env"

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 \

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 %}