Bug fixes for GCP modules (as of 2019-01-09T15:35:45-08:00) (#50784)

test/integration/targets/gcp_compute_instance/tasks/main.yml

@@ -211,6 +211,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a address
   gcp_compute_address:
       name: "address-instance"
@@ -220,6 +221,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: address
+  ignore_errors: true
 - name: delete a network
   gcp_compute_network:
       name: "network-instance"
@@ -228,6 +230,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true
 - name: delete a disk
   gcp_compute_disk:
       name: "disk-instance"
@@ -239,3 +242,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: disk
+  ignore_errors: true

test/integration/targets/gcp_compute_instance_group/tasks/main.yml

@@ -141,6 +141,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a network
   gcp_compute_network:
       name: "network-instancegroup"
@@ -149,3 +150,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml

@@ -166,6 +166,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a instance template
   gcp_compute_instance_template:
       name: "{{ resource_name }}"
@@ -187,6 +188,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: instancetemplate
+  ignore_errors: true
 - name: delete a address
   gcp_compute_address:
       name: "address-instancetemplate"
@@ -196,6 +198,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: address
+  ignore_errors: true
 - name: delete a network
   gcp_compute_network:
       name: "network-instancetemplate"
@@ -204,3 +207,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_instance_template/tasks/main.yml

@@ -188,6 +188,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a address
   gcp_compute_address:
       name: "address-instancetemplate"
@@ -197,6 +198,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: address
+  ignore_errors: true
 - name: delete a network
   gcp_compute_network:
       name: "network-instancetemplate"
@@ -205,3 +207,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_region_disk/tasks/main.yml

@@ -21,8 +21,8 @@
         raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
       region: us-central1
       replica_zones:
-      - us-central1-a
-      - us-central1-f
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-a
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -36,8 +36,8 @@
         raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
       region: us-central1
       replica_zones:
-      - us-central1-a
-      - us-central1-f
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-a
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -72,8 +72,8 @@
         raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
       region: us-central1
       replica_zones:
-      - us-central1-a
-      - us-central1-f
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-a
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -93,8 +93,8 @@
         raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
       region: us-central1
       replica_zones:
-      - us-central1-a
-      - us-central1-f
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-a
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -129,8 +129,8 @@
         raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
       region: us-central1
       replica_zones:
-      - us-central1-a
-      - us-central1-f
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-a
+      - https://www.googleapis.com/compute/v1/projects/google.com:graphite-playground/zones/us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"

test/integration/targets/gcp_compute_route/tasks/main.yml

@@ -144,6 +144,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a network
   gcp_compute_network:
       name: "network-route"
@@ -152,3 +153,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_router/tasks/main.yml

@@ -166,6 +166,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a network
   gcp_compute_network:
       name: "network-router"
@@ -174,3 +175,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_subnetwork/tasks/main.yml

@@ -132,6 +132,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a network
   gcp_compute_network:
       name: "network-subnetwork"
@@ -141,3 +142,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: network
+  ignore_errors: true

test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml

@@ -154,6 +154,7 @@
       - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
+# If errors happen, don't crash the playbook!
 - name: delete a url map
   gcp_compute_url_map:
       name: "urlmap-targethttpproxy"
@@ -163,6 +164,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: urlmap
+  ignore_errors: true
 - name: delete a backend service
   gcp_compute_backend_service:
       name: "backendservice-targethttpproxy"
@@ -176,6 +178,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: backendservice
+  ignore_errors: true
 - name: delete a http health check
   gcp_compute_http_health_check:
       name: "httphealthcheck-targethttpproxy"
@@ -188,6 +191,7 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: healthcheck
+  ignore_errors: true
 - name: delete a instance group
   gcp_compute_instance_group:
       name: "instancegroup-targethttpproxy"
@@ -197,3 +201,4 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
   register: instancegroup
+  ignore_errors: true