From 34dcc2d0b68d9bd549183a81b531e278bd448589 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 31 Oct 2017 14:59:04 -0400 Subject: Ensure GCP image build instance gets cleaned up on teardown --- roles/openshift_gcp/templates/remove.j2.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/openshift_gcp/templates/remove.j2.sh b/roles/openshift_gcp/templates/remove.j2.sh index 10b463349..c9213b800 100644 --- a/roles/openshift_gcp/templates/remove.j2.sh +++ b/roles/openshift_gcp/templates/remove.j2.sh @@ -68,6 +68,12 @@ fi done ) & +# Instances and disks used for image building +( + teardown "{{ openshift_gcp_prefix }}build-image-instance" compute instances --zone "{{ openshift_gcp_zone }}" + teardown "{{ openshift_gcp_prefix }}build-image-instance" compute disks --zone "{{ openshift_gcp_zone }}" +) & + # DNS ( dns_zone="{{ dns_managed_zone | default(openshift_gcp_prefix + 'managed-zone') }}" -- cgit v1.2.3