openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-04-13 04:34:03 +00:00 committed by Gerrit Code Review
commit 3e1acf005e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -27,6 +27,7 @@ RUN apt-get install -y --no-install-recommends \
RUN yum -y install \ RUN yum -y install \
conntrack-tools \ conntrack-tools \
dnsmasq \ dnsmasq \
dnsmasq-utils \
ipset \ ipset \
openvswitch \ openvswitch \
uuid \ uuid \
@ -38,6 +39,7 @@ RUN apt-get install -y --no-install-recommends \
arping \ arping \
conntrack \ conntrack \
dnsmasq \ dnsmasq \
dnsmasq-utils \
ipset \ ipset \
iptables \ iptables \
openvswitch-switch \ openvswitch-switch \

10
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -22,9 +22,17 @@ RUN apt-get install -y --no-install-recommends \
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# Install required packages # Install required packages
RUN yum install -y ebtables \ RUN yum install -y \
ebtables \
bridge-utils \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y \
ebtables \
bridge-utils \
&& apt-get clean
{% endif %} {% endif %}
{% endif %} {% endif %}