Update DW teardown for single service deployment

Signed-off-by: Webster Mudge <wmudge@cloudera.com>

Author: wmudge

roles/runtime/tasks/teardown_base.yml

@@ -33,18 +33,16 @@
   register: __opdb_teardowns_info
 
 - name: Execute CDP DW cluster teardown
+  register: __dw_teardown_info
   when:
     - run__include_dw or run__force_teardown | bool
     - run__env_info.environments | length > 0
-    - run__env_info.environments[0].descendants.dw | length > 0
+    #- run__env_info.environments[0].descendants.dw | length > 0
   cloudera.cloud.dw_cluster:
     env: "{{ run__env_name }}"
     state: absent
-    wait: yes
+    wait: no
     force: "{{ run__dw_force_delete }}"
-  async: 3600 # 1 hour timeout
-  poll: 0
-  register: __dw_cluster_teardown_info
 
 - name: Execute CDP Dataflow teardown
   register: __df_teardown_info
@@ -166,16 +164,16 @@
   retries: 120
   delay: 30
 
-- name: Wait for CDP Data Warehouse deployments to decommission
+- name: Wait for CDP DW deployments to decommission
   when:
-    - __dw_cluster_teardown_info is defined
-  ansible.builtin.async_status:
-    jid: "{{ __dw_cluster_teardown_info.ansible_job_id }}"
-  register: __dw_cluster_teardown_async
-  until: __dw_cluster_teardown_async.finished
-  retries: 120
-  delay: 30
-  
+    - __dw_teardown_info is defined
+    - __dw_teardown_info.started | default(False)
+  cloudera.cloud.dw_cluster:
+    env: "{{ run__env_name }}"
+    state: absent
+    wait: yes
+    force: "{{ run__dw_force_delete }}"
+
 - name: Wait for CDP OpDB deployments to decommission
   when:
     - __opdb_teardowns_info is defined