summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@redhat.com>2014-10-01 18:18:35 -0400
committerThomas Wiest <twiest@redhat.com>2014-10-01 18:18:35 -0400
commit49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47 (patch)
tree97259b49b26c5e8695b8c2e7ee3e017593dbbf76
parentf5d9b265b782f1fbe3583b294c7bcbae57f64ad2 (diff)
downloadopenshift-49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47.tar.gz
openshift-49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47.tar.bz2
openshift-49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47.tar.xz
openshift-49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47.zip
Fixed terminate so that it properly removes the attached OS disk.
-rw-r--r--playbooks/gce/os3-master/terminate.yml21
1 files changed, 10 insertions, 11 deletions
diff --git a/playbooks/gce/os3-master/terminate.yml b/playbooks/gce/os3-master/terminate.yml
index b6a1b38e4..7895cf016 100644
--- a/playbooks/gce/os3-master/terminate.yml
+++ b/playbooks/gce/os3-master/terminate.yml
@@ -11,7 +11,6 @@
- debug: msg="{{ groups['oo_hosts_to_terminate'] }}"
-
- name: Terminate instances
hosts: localhost
connection: local
@@ -25,15 +24,15 @@
instance_names: "{{ groups['oo_hosts_to_terminate'] }}"
disks: "{{ groups['oo_hosts_to_terminate'] }}"
register: gce
-
- - debug: var=gce
-# - name: Remove disks of instances
-# gce_pd:
-# service_account_email: "{{ gce_service_account_email }}"
-# pem_file: "{{ gce_pem_file }}"
-# project_id: "{{ gce_project_id }}"
-# name: "{{ item }}"
-# state: deleted
-# with_items: gce.instance_names
+ - debug: var=gce
+ - name: Remove disks of instances
+ gce_pd:
+ service_account_email: "{{ gce_service_account_email }}"
+ pem_file: "{{ gce_pem_file }}"
+ project_id: "{{ gce_project_id }}"
+ name: "{{ item }}"
+ zone: "{{ gce.zone }}"
+ state: absent
+ with_items: gce.instance_names