summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2014-10-01 15:32:59 -0700
committerJhon Honce <jhonce@redhat.com>2014-10-02 15:36:11 -0700
commit2808f726dacb60e58c289c18a91258e0526705a3 (patch)
tree42f21f7937eab6b6b6ba5e900dd57fa0444c4b5a
parent346da608fbc71029ccac7ca559af38b0f218f3fe (diff)
downloadopenshift-2808f726dacb60e58c289c18a91258e0526705a3.tar.gz
openshift-2808f726dacb60e58c289c18a91258e0526705a3.tar.bz2
openshift-2808f726dacb60e58c289c18a91258e0526705a3.tar.xz
openshift-2808f726dacb60e58c289c18a91258e0526705a3.zip
WIP Infra - Refactor terminate
* remove persistent disks from images
-rw-r--r--playbooks/gce/origin-master/terminate.yml20
-rw-r--r--playbooks/gce/origin-minion/terminate.yml18
-rw-r--r--playbooks/gce/os3-minion/terminate.yml17
3 files changed, 30 insertions, 25 deletions
diff --git a/playbooks/gce/origin-master/terminate.yml b/playbooks/gce/origin-master/terminate.yml
index b6a1b38e4..76e1404b5 100644
--- a/playbooks/gce/origin-master/terminate.yml
+++ b/playbooks/gce/origin-master/terminate.yml
@@ -25,15 +25,17 @@
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
+ - 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
+
diff --git a/playbooks/gce/origin-minion/terminate.yml b/playbooks/gce/origin-minion/terminate.yml
index d31f175e1..97b31eca0 100644
--- a/playbooks/gce/origin-minion/terminate.yml
+++ b/playbooks/gce/origin-minion/terminate.yml
@@ -28,12 +28,14 @@
- 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
+ - 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
+
diff --git a/playbooks/gce/os3-minion/terminate.yml b/playbooks/gce/os3-minion/terminate.yml
index d31f175e1..0c7a2f55e 100644
--- a/playbooks/gce/os3-minion/terminate.yml
+++ b/playbooks/gce/os3-minion/terminate.yml
@@ -28,12 +28,13 @@
- 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
+ - 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