Merge "TLS loadbalancer creation fails due to unread neutron_lbaas.conf" into stable/newton

ansible/roles/neutron/tasks/config.yml

@@ -77,6 +77,7 @@
     dest: "{{ node_config_directory }}/{{ item }}/neutron_lbaas.conf"
   with_items:
     - "neutron-server"
+    - "neutron-lbaas-agent"
 
 - name: Copying over neutron_vpnaas.conf
   merge_configs:

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/plugins/ml2/ml2_conf.ini --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-file /etc/neutron/neutron_lbaas.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
@@ -18,6 +18,12 @@
             "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
             "owner": "neutron",
             "perm": "0600"
+        },
+        {
+            "source": "{{ container_config_directory }}/neutron_lbaas.conf",
+            "dest": "/etc/neutron/neutron_lbaas.conf",
+            "owner": "neutron",
+            "perm": "0600"
         }
     ],
     "permissions": [