Merge pull request #22 from twiest/pr

cleaned up unused GCE host types, changed back to using gce.ini, and added a better ssh detection on launch.

1 files changed, 0 insertions, 40 deletions

diff --git a/playbooks/gce/os3-minion/terminate.yml b/playbooks/gce/os3-minion/terminate.yml
deleted file mode 100644
index 0c7a2f55e..000000000
--- a/playbooks/gce/os3-minion/terminate.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- name: "populate oo_hosts_to_terminate host group if needed"
-  hosts: localhost
-  gather_facts: no
-  tasks:
-    - debug: var=oo_host_group_exp
-
-    - name: Evaluate oo_host_group_exp if it's set
-      add_host: "name={{ item }} groups=oo_hosts_to_terminate"
-      with_items: "{{ oo_host_group_exp | default('') }}"
-      when: oo_host_group_exp is defined
-
-    - debug: msg="{{ groups['oo_hosts_to_terminate'] }}"
-
-
-- name: Terminate instances
-  hosts: localhost
-  connection: local
-  tasks:
-    - name: Terminate minion instances
-      gce:
-        service_account_email: "{{ gce_service_account_email }}"
-        pem_file: "{{ gce_pem_file }}"
-        project_id: "{{ gce_project_id }}"
-        state: 'absent'
-        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 }}"
-        zone: "{{ gce.zone }}"
-        state: absent
-      with_items: gce.instance_names
-