diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 04:34:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 04:34:03 +0000 |
| commit | 3e1acf005e0c396ef9fc4efd0d3866ebd703b2c3 (patch) | |
| tree | 6fa7ce5ecf2bd9e196b97ad3a02ba888d286b96c /docker | |
| parent | 544c00b4975d86b1d4a6a5cd5b923073c99d1ece (diff) | |
| parent | eec09486a37299edb7c18b8d3345c164c338ba55 (diff) | |
| download | kolla-3e1acf005e0c396ef9fc4efd0d3866ebd703b2c3.tar.gz kolla-3e1acf005e0c396ef9fc4efd0d3866ebd703b2c3.zip | |
Merge "Fix launch vm failed in neutron-linuxbridge-agent env"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 0c1458758..f8a9f9f5b 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 e7775ecb1..dddc8b569 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 %} |