2 files changed, 33 insertions, 11 deletions

diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml
new file mode 100644
index 000000000..5e43ee81e
--- /dev/null
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/delete_vm.yml
@@ -0,0 +1,29 @@
+# Copyright (c) 2017-2018 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+# Ignore errors as VM can be destroyed without been undefined.
+- name: Destroy old VMs
+  virt:
+    command: destroy
+    name: "{{ node_item.hostname }}"
+  when: node_item.hostname in virt_vms.list_vms
+  ignore_errors: yes
+
+# Ignore errors as VM can be running while undefined
+- name: Undefine old VMs
+  virt:
+    command: undefine
+    name: "{{ node_item.hostname }}"
+  when: node_item.hostname in virt_vms.list_vms
+  ignore_errors: yes
diff --git a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
index 5595cd501..e6c2c0229 100644
--- a/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
+++ b/ansible/roles/infra_destroy_previous_configuration/tasks/main.yml
@@ -26,17 +26,10 @@
   register: virt_vms
 
 - name: Destroy old VMs
-  virt:
-    command: destroy
-    name: "{{ item.hostname }}"
-  when: item.hostname in virt_vms.list_vms
-  with_items: "{{ infra_deploy_vars.nodes }}"
-
-- name: Undefine old VMs
-  virt:
-    command: undefine
-    name: "{{ item.hostname }}"
-  when: item.hostname in virt_vms.list_vms
+  include_tasks: delete_vm.yml
+  extra_vars: "{{ virt_vms }}"
+  loop_control:
+    loop_var: node_item
   with_items: "{{ infra_deploy_vars.nodes }}"
 
 - name: Delete old networks