aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-15 15:53:34 +0000
committerGerrit Code Review <review@openstack.org>2016-08-15 15:53:34 +0000
commitec569e752d7464307c40aa371fd4ef8788ed8737 (patch)
tree1bbd202c8064bae7ee2927bcaa8032525b265032 /docker/neutron
parent55ddbad92ae08805479e67691f158bce7abdbf10 (diff)
parent512be70cee96f6d72744094ec2226bf75fc9d16e (diff)
downloadkolla-ec569e752d7464307c40aa371fd4ef8788ed8737.tar.gz
kolla-ec569e752d7464307c40aa371fd4ef8788ed8737.zip
Merge "Fix the neutron-lbaas-agent container issues"
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-lbaas-agent/Dockerfile.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index 9c6d5cce6..5ad14ca99 100644
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
@@ -5,12 +5,14 @@ MAINTAINER {{ maintainer }}
RUN yum -y install \
haproxy \
+ net-tools \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
haproxy \
+ net-tools \
&& apt-get clean
{% endif %}
@@ -20,6 +22,7 @@ RUN apt-get -y install --no-install-recommends \
RUN yum -y install \
openstack-neutron-lbaas \
+ net-tools \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
@@ -28,6 +31,7 @@ RUN apt-get -y install --no-install-recommends \
neutron-lbaas-common \
neutron-lbaasv2-agent \
python-neutron-lbaas \
+ net-tools \
&& apt-get clean
{% endif %}