1 files changed, 2 insertions, 33 deletions
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 2527852e..e0a9088f 100755
--- 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 \