diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-04-08 23:45:50 +0800 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-04-08 15:53:31 -0400 |
| commit | eec09486a37299edb7c18b8d3345c164c338ba55 (patch) | |
| tree | 99cd2d8f638cf6ffc3a318b6720d74dfa3dee81d /docker | |
| parent | ad1461f46d730ed0393ffcb16b866ed2e0f34943 (diff) | |
| download | kolla-eec09486a37299edb7c18b8d3345c164c338ba55.tar.gz kolla-eec09486a37299edb7c18b8d3345c164c338ba55.zip | |
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
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 0abb05447..0635151d7 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 %} |