openstack/kolla
Code Issues Proposed changes

Merge "Add conntrack-tools"

Browse Source
This commit is contained in:
Jenkins 2016-03-23 16:20:56 +00:00 committed by Gerrit Code Review
commit 721229297e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,8 +14,8 @@ RUN yum -y install \
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
neutron-plugin-ml2 \ neutron-plugin-ml2 \
openvswitch-switch \
neutron-server \ neutron-server \
openvswitch-switch \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /usr/share/neutron \ && mkdir -p /usr/share/neutron \
&& ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
@ -25,16 +25,18 @@ RUN apt-get install -y --no-install-recommends \
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ RUN yum -y install \
uuid \ conntrack-tools \
dnsmasq \ dnsmasq \
ipset \ ipset \
openvswitch \ openvswitch \
uuid \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
arping \ arping \
conntrack \
dnsmasq \ dnsmasq \
ipset \ ipset \
iptables \ iptables \