diff options
| author | Thomas Wiest <twiest@gmail.com> | 2014-10-01 18:21:40 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@gmail.com> | 2014-10-01 18:21:40 -0400 |
| commit | 50b543ac15983a4d84d2f1843ee9e5a6bd28da4e (patch) | |
| tree | 97259b49b26c5e8695b8c2e7ee3e017593dbbf76 | |
| parent | 76cc8858f9bfa841797188e76015861258bcd241 (diff) | |
| parent | 49bcc9b8d47f52ca1e49090e130ce5f6fbb89c47 (diff) | |
| download | openshift-50b543ac15983a4d84d2f1843ee9e5a6bd28da4e.tar.gz openshift-50b543ac15983a4d84d2f1843ee9e5a6bd28da4e.tar.bz2 openshift-50b543ac15983a4d84d2f1843ee9e5a6bd28da4e.tar.xz openshift-50b543ac15983a4d84d2f1843ee9e5a6bd28da4e.zip | |
Merge pull request #5 from twiest/quick
Fixed terminate so that it properly removes the attached OS disk.
| -rw-r--r-- | playbooks/gce/os3-master/terminate.yml | 21 |
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 |