From ef0cb9e58d9bd87bd1ff33f2cbfed8478ed342ec Mon Sep 17 00:00:00 2001
From: Wolfgang Kulhanek <wkulhanek@users.noreply.github.com>
Date: Fri, 13 Mar 2020 19:44:37 +0100
Subject: [PATCH] Fix workload destroy (#1330)

---
 ansible/configs/ocp-workloads/post_software.yml |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ansible/configs/ocp-workloads/post_software.yml b/ansible/configs/ocp-workloads/post_software.yml
index 8fe5292..db99517 100644
--- a/ansible/configs/ocp-workloads/post_software.yml
+++ b/ansible/configs/ocp-workloads/post_software.yml
@@ -60,29 +60,17 @@
     vars:
       ACTION: create
 
-  - name: Run multiple workloads
-    when:
-    - ocp_workloads is defined
-    - ocp_workloads | length > 0
-    loop: "{{ ocp_workloads }}"
-    loop_control:
-      loop_var: _ocp_workload
-    include_role:
-      name: "{{ _ocp_workload }}"
-    vars:
-      ACTION: create
-
   - name: Run a list of workloads
     when:
     - ocp_workloads is defined
     - ocp_workloads | length > 0
+    loop: "{{ ocp_workloads }}"
+    loop_control:
+      loop_var: _ocp_workload
     include_role:
       name: "{{ _ocp_workload }}"
     vars:
       ACTION: create
-    loop: "{{ ocp_workloads }}"
-    loop_control:
-      loop_var: _ocp_workload
 
 - name: Cleanup
   import_playbook: cleanup.yml

--
Gitblit v1.9.3