diff options
| author | Thomas Wiest <twiest@redhat.com> | 2014-10-30 16:40:52 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@redhat.com> | 2014-10-30 16:40:52 -0400 |
| commit | 317d20d2cd7847ac295e63015c540a882f77964e (patch) | |
| tree | 1c1e004039a2f42730b385633462197a5c463e30 /playbooks/gce/os3-router | |
| parent | d57f8d6968f0b580d3201df197eda98ed5f8fe19 (diff) | |
| download | openshift-317d20d2cd7847ac295e63015c540a882f77964e.tar.gz openshift-317d20d2cd7847ac295e63015c540a882f77964e.tar.bz2 openshift-317d20d2cd7847ac295e63015c540a882f77964e.tar.xz openshift-317d20d2cd7847ac295e63015c540a882f77964e.zip | |
cleaned up unused GCE host types, changed back to using gce.ini, and added a better ssh detection on launch.
Diffstat (limited to 'playbooks/gce/os3-router')
| -rw-r--r-- | playbooks/gce/os3-router/config.yml | 17 | ||||
| -rw-r--r-- | playbooks/gce/os3-router/launch.yml | 38 | ||||
| -rw-r--r-- | playbooks/gce/os3-router/vars.yml | 0 |
3 files changed, 0 insertions, 55 deletions
diff --git a/playbooks/gce/os3-router/config.yml b/playbooks/gce/os3-router/config.yml deleted file mode 100644 index 8103faa5f..000000000 --- a/playbooks/gce/os3-router/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-router/launch.yml b/playbooks/gce/os3-router/launch.yml deleted file mode 100644 index 2fe105377..000000000 --- a/playbooks/gce/os3-router/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-router/vars.yml b/playbooks/gce/os3-router/vars.yml deleted file mode 100644 index e69de29bb..000000000 --- a/playbooks/gce/os3-router/vars.yml +++ /dev/null |