minor fixes

redhat-cop · Oct 3, 2023 · 4358710 · 4358710
1 parent f4f84ce
commit 4358710
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/roles/create_rds_global_cluster/tasks/delete.yml b/roles/create_rds_global_cluster/tasks/delete.yml
@@ -19,7 +19,6 @@
             skip_final_snapshot: true
             wait: false
             state: absent
-          when: _result_replica_cluster_info.clusters[0].db_cluster_members | length >= 1
 
         - name: Delete replica cluster without creating a final snapshot
           amazon.aws.rds_cluster:
@@ -46,14 +45,12 @@
             skip_final_snapshot: true
             wait: false
             state: absent
-          when: _result_primary_cluster_info.clusters[0].db_cluster_members | length >= 1
 
         - name: Delete primary cluster without creating a final snapshot
           amazon.aws.rds_cluster:
             cluster_id: "{{ create_rds_global_cluster_primary_cluster_name }}"
             region: "{{ create_rds_global_cluster_primary_cluster_region }}"
             global_cluster_identifier: "{{ create_rds_global_cluster_global_cluster_name }}"
-            remove_from_global_db: true
             skip_final_snapshot: True
             state: absent
       when: _result_primary_cluster_info.clusters | length != 0

diff --git a/tests/integration/targets/test_create_rds_global_cluster/tasks/main.yml b/tests/integration/targets/test_create_rds_global_cluster/tasks/main.yml
@@ -38,6 +38,7 @@
     - name: Get Global DB information
       amazon.cloud.rds_global_cluster:
         global_cluster_identifier: "{{ test_global_cluster_name }}"
+        region: "{{ test_primary_cluster_region }}"
         state: describe
       register: global_cluster_info
 
@@ -103,5 +104,6 @@
     - name: Delete Aurora global cluster
       amazon.cloud.rds_global_cluster:
         global_cluster_identifier: "{{ test_global_cluster_name }}"
+        region: "{{ test_primary_cluster_region }}"
         state: absent
       ignore_errors: true