diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-10-31 14:59:04 -0400 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2017-10-31 14:59:20 -0400 |
| commit | 34dcc2d0b68d9bd549183a81b531e278bd448589 (patch) | |
| tree | 836a512b175dbf82c7c8925849437cc6e9e9fbdd | |
| parent | e3d95a3e9e26353d5cdfc304f89fe047efb53a44 (diff) | |
| download | openshift-34dcc2d0b68d9bd549183a81b531e278bd448589.tar.gz openshift-34dcc2d0b68d9bd549183a81b531e278bd448589.tar.bz2 openshift-34dcc2d0b68d9bd549183a81b531e278bd448589.tar.xz openshift-34dcc2d0b68d9bd549183a81b531e278bd448589.zip | |
Ensure GCP image build instance gets cleaned up on teardown
| -rw-r--r-- | roles/openshift_gcp/templates/remove.j2.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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') }}" |