From 512be70cee96f6d72744094ec2226bf75fc9d16e Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Wed, 27 Jul 2016 11:14:20 +0800
Subject: [PATCH] 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
---
 ansible/roles/neutron/tasks/config.yml                 |  1 +
 ansible/roles/neutron/tasks/start.yml                  |  1 +
 ansible/roles/neutron/templates/lbaas_agent.ini.j2     | 10 ----------
 .../neutron/templates/neutron-lbaas-agent.json.j2      |  8 +++++++-
 docker/neutron/neutron-lbaas-agent/Dockerfile.j2       |  4 ++++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 3495611aac..3ece8199bd 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -75,6 +75,7 @@
     - "neutron-dhcp-agent"
     - "neutron-l3-agent"
     - "neutron-linuxbridge-agent"
+    - "neutron-lbaas-agent"
     - "neutron-metadata-agent"
     - "neutron-openvswitch-agent"
     - "neutron-server"
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml
index 80e65b6013..0d29efe256 100644
--- a/ansible/roles/neutron/tasks/start.yml
+++ b/ansible/roles/neutron/tasks/start.yml
@@ -196,6 +196,7 @@
     privileged: True
     volumes:
       - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
+      - "/etc/localtime:/etc/localtime:ro"
       - "/run:/run"
       - "/run/netns/:/run/netns/:shared"
       - "neutron_metadata_socket:/var/lib/neutron/kolla/"
diff --git a/ansible/roles/neutron/templates/lbaas_agent.ini.j2 b/ansible/roles/neutron/templates/lbaas_agent.ini.j2
index b9545ec1c4..973bd61800 100644
--- a/ansible/roles/neutron/templates/lbaas_agent.ini.j2
+++ b/ansible/roles/neutron/templates/lbaas_agent.ini.j2
@@ -1,15 +1,5 @@
 [DEFAULT]
 debug = {{ neutron_logging_debug }}
-
-output_file = /etc/neutron/lbaas_agent.ini
-wrap_width = 79
-
-{% if neutron_plugin_agent == "openvswitch" %}
-interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
-{% elif neutron_plugin_agent == "linuxbridge" %}
-interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
-{% endif %}
-
 device_driver = neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver
 
 [haproxy]
diff --git a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
index 541a25524b..6bb45cdeec 100644
--- a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini",
+    "command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/lbaas_agent.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
@@ -12,6 +12,12 @@
             "dest": "/etc/neutron/lbaas_agent.ini",
             "owner": "neutron",
             "perm": "0600"
+        },
+        {
+            "source": "{{ container_config_directory }}/ml2_conf.ini",
+            "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
+            "owner": "neutron",
+            "perm": "0600"
         }
     ]
 }
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index 9c6d5cce67..5ad14ca995 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 %}