New VM improvements

ansible/roles/win_vms/tasks/main.yml

@@ -1,15 +1,25 @@
 ---
-- import_tasks: workbench.yml
-  when: new_wb_quantity|int > 0
+- name: Create VMs
+  block:
+    - import_tasks: workbench.yml
+      when: new_wb_quantity|int > 0
 
-- import_tasks: application.yml
-  when: new_app_quantity|int > 0
+    - import_tasks: application.yml
+      when: new_app_quantity|int > 0
 
-- import_tasks: gpu.yml
-  when: new_gpu_quantity|int > 0
+    - import_tasks: gpu.yml
+      when: new_gpu_quantity|int > 0
 
-- name: Set Password Status
-  replace:
-    path: /deployments/{{ os_project }}-{{ win_project }}/PASSWORD
-    regexp: '^finished$'
-    replace: 'pending'
+    - name: Set Password Status
+      replace:
+        path: /deployments/{{ os_project }}-{{ win_project }}/PASSWORD
+        regexp: '^finished$'
+        replace: 'pending'
+      when:
+        - new_wb_quantity|int > 0
+        - new_app_quantity|int > 0
+        - new_gpu_quantity|int > 0
+  when: cleanup == 'false'
+
+- import_tasks: metadata.yml
+  when: cleanup == 'true'