Bug fix for odl_l2

The "external_network_bridge" should be configured in neutron-server's
LXC container. Currently we configure it in agents' LXC container.
So in ODL L2 scenario, the DNAT failed.
This patch will fix this.

Change-Id: Ifca005d8cdb901d114838ec88d2f24bcee73abf7
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

diff --git a/plugins/odl_cluster/tasks/control-agents-3.yml b/plugins/odl_cluster/tasks/control-agents-3.yml
index 9d7ddeb..68446a8 100644 (file)
--- a/plugins/odl_cluster/tasks/control-agents-3.yml
+++ b/plugins/odl_cluster/tasks/control-agents-3.yml
@@ -13,6 +13,11 @@
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12;
   when: odl_l3_agent == "Enable"
 
+- name: configure external bridge name for L2
+  shell: |
+    crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider;
+  when: odl_l3_agent == "Disable"
+
 - name: configure opendaylight in ml2
   shell: |
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl username admin;

diff --git a/plugins/odl_cluster/tasks/control-servers-2.yml b/plugins/odl_cluster/tasks/control-servers-2.yml
index 5bfc24e..59b3aa2 100644 (file)
--- a/plugins/odl_cluster/tasks/control-servers-2.yml
+++ b/plugins/odl_cluster/tasks/control-servers-2.yml
@@ -19,9 +19,9 @@
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings physnet:eth12;
   when: odl_l3_agent == "Enable"
 
-- name: configure external bridge name for L2
+- name: turn off l3 ha for odl l2
   shell: |
-    crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-provider;
+    crudini --set /etc/neutron/neutron.conf DEFAULT l3_ha "False";
   when: odl_l3_agent == "Disable"
 
 - name: configure opendaylight in ml2