Merge "Fix the neutron-lbaas-agent container issues"

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"

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/"

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]

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"
         }
     ]
 }

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 %}