X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Finfra_destroy_previous_configuration%2Ftasks%2Fdelete_network.yml;h=5e616335a1d01e86495b973d41fb08e1176439e2;hb=41fb1bcb3ef34137e48ff9755cc82f2fc5fe9074;hp=314ee30afe4e51a6552cdc9671866b9797e84d05;hpb=5ad70e9e75a0061d233d1d7a786b40ea2887361c;p=yardstick.git

diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
index 314ee30af..5e616335a 100644
--- a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_network.yml
@@ -14,18 +14,18 @@
 ---
 - name: Destroy old networks created by virt
   virt_net:
-    name: "{{ network_item.name }}"
+    name: "{{ network_item }}"
     command: destroy
-  when: network_item.name in virt_nets.list_nets
+  when: clean_up | bool or network_item in deploy_nets
 
-# Ignoring erros as network can be created without being defined.
+# Ignoring errors as network can be created without being defined.
 # This can happen if a user manually creates a network using the virsh command.
 # If the network is not defined the undefine code will throw an error.
 - name: Undefine old networks defined by virt
   virt_net:
-    name: "{{ network_item.name }}"
+    name: "{{ network_item }}"
     command: undefine
-  when: network_item.name in virt_nets.list_nets
+  when: clean_up | bool or network_item in deploy_nets
   ignore_errors: yes
 
 - name: Check if "ovs-vsctl" command is present
@@ -34,15 +34,20 @@
   ignore_errors: yes
 
 - name: Destroy OVS bridge if it exists
-  command: ovs-vsctl --if-exists -- del-br "{{ network_item.name }}"
-  when: ovs_vsctl_present.rc == 0
+  command: ovs-vsctl --if-exists -- del-br "{{ network_item }}"
+  when:
+    - ovs_vsctl_present.rc == 0
+    - clean_up | bool or network_item in deploy_nets
+  ignore_errors: yes
 
 - name: Check if linux bridge is present
-  stat: path="{{ '/sys/class/net/'+network_item.name+'/brif/' }}"
+  stat: path="{{ '/sys/class/net/' + network_item + '/brif/' }}"
   register: check_linux_bridge
 
 - name: Remove linux bridge if it exists
   shell: |
-    ifconfig "{{ network_item.name }}" down
-    brctl delbr "{{ network_item.name }}"
-  when: check_linux_bridge.stat.exists
+    ifconfig "{{ network_item }}" down
+    brctl delbr "{{ network_item }}"
+  when:
+    - check_linux_bridge.stat.exists
+    - clean_up | bool or network_item in deploy_nets