Address comments in PR

Signed-off-by: Christopher Perro <[email protected]>

Author: cmperro

docs/configuration.yml

@@ -259,6 +259,7 @@ globals:
   dynamic_inventory:
     vm:
       count:
+      os:
   force_teardown:
   gcloud_credential_file:
   infra_deployment_engine:

roles/common/defaults/main.yml

@@ -117,11 +117,6 @@ common__aws_datalake_admin_suffix:        "{{ env.aws.role.label.datalake_admin
 common__aws_idbroker_role_name:           "{{ env.aws.role.name.idbroker | default([common__namespace, common__aws_idbroker_suffix, common__aws_role_suffix] | join('-')) }}"
 common__aws_idbroker_suffix:              "{{ env.aws.role.label.idbroker | default(common__idbroker_suffix) }}"
 
-
-common__aws_vpc_id:                       "{{ infra.aws.vpc.existing.vpc_id | default('') }}"
-common__aws_public_subnet_ids:            "{{ infra.aws.vpc.existing.public_subnet_ids | default([]) }}"
-common__aws_private_subnet_ids:           "{{ infra.aws.vpc.existing.private_subnet_ids | default([]) }}"
-
 # Azure Infra
 common__azure_storage_name:               "{{ infra.azure.storage.name | default(common__storage_name | replace('-','')) }}"
 

roles/runtime/tasks/initialize_teardown.yml

@@ -30,16 +30,17 @@
     name: "{{ run__env_name }}"
   register: run__df_env_info
 
+- name: Discover CDP Data Warehouse cluster
+  cloudera.cloud.dw_cluster_info:
+    env: "{{ run__env_name }}"
+  register: __dw_list
+
 - name: Discover CDP Data Warehouse deployments
   when: 
     - run__include_dw
     - not run__force_teardown | bool or not run__dw_force_delete | bool
+    - __dw_list.clusters | length > 0
   block:
-    - name: Discover CDP Data Warehouse cluster
-      cloudera.cloud.dw_cluster_info:
-        env: "{{ run__env_name }}"
-      register: __dw_list
-
     - name: Initialize CDP Data Warehouse cluster id
       ansible.builtin.set_fact:
         __dw_cluster_id: "{{ __dw_list.clusters | map(attribute='id') | first | default(omit) }}"