From 317d20d2cd7847ac295e63015c540a882f77964e Mon Sep 17 00:00:00 2001
From: Thomas Wiest <twiest@redhat.com>
Date: Thu, 30 Oct 2014 16:40:52 -0400
Subject: cleaned up unused GCE host types, changed back to using gce.ini, and
added a better ssh detection on launch.
---
playbooks/gce/os3-registry/config.yml | 17 ----------------
playbooks/gce/os3-registry/launch.yml | 38 -----------------------------------
playbooks/gce/os3-registry/vars.yml | 0
3 files changed, 55 deletions(-)
delete mode 100644 playbooks/gce/os3-registry/config.yml
delete mode 100644 playbooks/gce/os3-registry/launch.yml
delete mode 100644 playbooks/gce/os3-registry/vars.yml
(limited to 'playbooks/gce/os3-registry')
diff --git a/playbooks/gce/os3-registry/config.yml b/playbooks/gce/os3-registry/config.yml
deleted file mode 100644
index 8103faa5f..000000000
--- a/playbooks/gce/os3-registry/config.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- name: "populate oo_hosts_to_config host group if needed"
- hosts: localhost
- gather_facts: no
- tasks:
- - name: Evaluate oo_host_group_exp
- add_host: "name={{ item }} groups=oo_hosts_to_config"
- with_items: "{{ oo_host_group_exp | default('') }}"
- when: oo_host_group_exp is defined
-
-- name: "Configure instances"
- hosts: oo_hosts_to_config
- connection: ssh
- user: root
- vars_files:
- - vars.yml
- roles:
- - ../../../roles/base_os
diff --git a/playbooks/gce/os3-registry/launch.yml b/playbooks/gce/os3-registry/launch.yml
deleted file mode 100644
index 2fe105377..000000000
--- a/playbooks/gce/os3-registry/launch.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: Launch instance(s)
- hosts: localhost
- connection: local
- gather_facts: no
-
- vars:
- inst_names: "{{ oo_new_inst_names }}"
- machine_type: n1-standard-1
- image: libra-rhel7
-
- vars_files:
- - vars.yml
-
- tasks:
- - name: Launch instances
- gce:
- instance_names: "{{ inst_names }}"
- machine_type: "{{ machine_type }}"
- image: "{{ image }}"
- service_account_email: "{{ gce_service_account_email }}"
- pem_file: "{{ gce_pem_file }}"
- project_id: "{{ gce_project_id }}"
- tags: "{{ oo_new_inst_tags }}"
- register: gce
-
- - name: Add new instances public IPs to oo_hosts_to_config
- add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config"
- with_items: gce.instance_data
-
- - name: Wait for ssh
- wait_for: "port=22 host={{ item.public_ip }}"
- with_items: gce.instance_data
-
- - debug: var=gce
-
-# Apply the configs, seprate so that just the configs can be run by themselves
-- include: config.yml
diff --git a/playbooks/gce/os3-registry/vars.yml b/playbooks/gce/os3-registry/vars.yml
deleted file mode 100644
index e69de29bb..000000000
--
cgit v1.2.3