Remove ugly code in odl plugin

JIRA: -

Remove the ugly code in odl plugin. These code may cause tempest failures while
running daily functest. These failures cannot be reproduced locally but only in
daily functest. So we proposed this patch to improve our code and verify whether
it can fix the failures in tempest.

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

diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-3.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-3.yml
index 2527852..e0a9088 100755 (executable)
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-3.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-3.yml
@@ -4,41 +4,10 @@
   shell: |
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True";
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini ovs;
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security;
 
-- name: configure bridge_mappings -> ml2
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ contr_l2_mappings }}";
-  when:
-    - odl_l3_agent == "Disable"
-    - inventory_hostname not in groups['nova_compute']
-
-- name: configure bridge_mappings -> ml2
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ compu_l2_mappings }}";
-  when:
-    - odl_l3_agent == "Disable"
-    - inventory_hostname in groups['nova_compute']
-
-- name: configure bridge_mappings for L3
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ contr_l3_mappings }}";
-  when:
-    - odl_l3_agent == "Enable"
-    - inventory_hostname not in groups['nova_compute']
-
-- name: configure bridge_mappings for L3
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ compu_l3_mappings }}";
-  when:
-    - odl_l3_agent == "Enable"
-    - inventory_hostname in groups['nova_compute']
-
 - name: configure external bridge name for L2
   shell: |
     crudini --set /etc/neutron/l3_agent.ini \

diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-2.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-2.yml
index a5d31d4..39d0312 100755 (executable)
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-2.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-2.yml
@@ -10,16 +10,9 @@
   shell: >
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True";
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini ovs;
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings
-    "{{ contr_l2_mappings }}";
-
-- name: configure bridge_mappings for L3
-  shell: >
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings
-    "{{ contr_l3_mappings }}";
-  when: odl_l3_agent == "Enable"
 
 - name: turn off l3 ha for odl l2
   shell: |

diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml
index 2527852..e0a9088 100755 (executable)
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml
@@ -4,41 +4,10 @@
   shell: |
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True";
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini ovs;
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security;
 
-- name: configure bridge_mappings -> ml2
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ contr_l2_mappings }}";
-  when:
-    - odl_l3_agent == "Disable"
-    - inventory_hostname not in groups['nova_compute']
-
-- name: configure bridge_mappings -> ml2
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ compu_l2_mappings }}";
-  when:
-    - odl_l3_agent == "Disable"
-    - inventory_hostname in groups['nova_compute']
-
-- name: configure bridge_mappings for L3
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ contr_l3_mappings }}";
-  when:
-    - odl_l3_agent == "Enable"
-    - inventory_hostname not in groups['nova_compute']
-
-- name: configure bridge_mappings for L3
-  shell: |
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \
-    ovs bridge_mappings "{{ compu_l3_mappings }}";
-  when:
-    - odl_l3_agent == "Enable"
-    - inventory_hostname in groups['nova_compute']
-
 - name: configure external bridge name for L2
   shell: |
     crudini --set /etc/neutron/l3_agent.ini \

diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml
index b54fce2..d8bcf15 100755 (executable)
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml
@@ -10,16 +10,9 @@
   shell: >
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True";
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini ovs;
+    crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver;
     crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security;
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings
-    "{{ contr_l2_mappings }}";
-
-- name: configure bridge_mappings for L3
-  shell: >
-    crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings
-    "{{ contr_l3_mappings }}";
-  when: odl_l3_agent == "Enable"
 
 - name: turn off l3 ha for odl l2
   shell: |