From 512be70cee96f6d72744094ec2226bf75fc9d16e Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 27 Jul 2016 11:14:20 +0800 Subject: Fix the neutron-lbaas-agent container issues * copy the ml2_conf.ini file to the container * map the host /etc/localtime file to the container * remove the output_file and wrap_with options in the lbaas_agent.ini file, which are useless * remove the interface_driver in the lbaas_agent, which is configured in the neutron.conf file * install net-tools package into the container, which is used by the neutron-lbaas Change-Id: Ia58d825e41d3b843d8c6e6b3c9ee1756c1aed1ac Closes-Bug: #1606755 --- docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker') 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 %} -- cgit v1.2.3