diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-23 16:20:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-23 16:20:56 +0000 |
| commit | 721229297eae59862c44496e3eb359ea805d5541 (patch) | |
| tree | 1c25896e55857c7f5ffaa5f16d7d6ad33137dcaa | |
| parent | 2bed01f981f8bc90332a651c979326beb914c479 (diff) | |
| parent | 27975f8ab563a769d457111e64694906b2c8f1b1 (diff) | |
| download | kolla-721229297eae59862c44496e3eb359ea805d5541.tar.gz kolla-721229297eae59862c44496e3eb359ea805d5541.zip | |
Merge "Add conntrack-tools"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 2c036037c..0c1458758 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -14,8 +14,8 @@ RUN yum -y install \ RUN apt-get install -y --no-install-recommends \ neutron-plugin-ml2 \ - openvswitch-switch \ neutron-server \ + openvswitch-switch \ && apt-get clean \ && mkdir -p /usr/share/neutron \ && 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'] %} RUN yum -y install \ - uuid \ + conntrack-tools \ dnsmasq \ ipset \ openvswitch \ + uuid \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ arping \ + conntrack \ dnsmasq \ ipset \ iptables \ |