summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/tasks
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-06 16:59:00 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-06 16:59:00 +0200
commita3ba0278879075e14373a6872acc5f0c3cc3d9a2 (patch)
tree3c0a829dabf217cbabb77075153664e869d4bcda /playbooks/gce/openshift-cluster/tasks
parent071eee9acb80621919dda2a07f9fe9c56dcfda27 (diff)
downloadopenshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.gz
openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.bz2
openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.xz
openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.zip
Revert "Revert "GCE support""
This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
Diffstat (limited to 'playbooks/gce/openshift-cluster/tasks')
-rw-r--r--playbooks/gce/openshift-cluster/tasks/launch_instances.yml21
1 files changed, 13 insertions, 8 deletions
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index 6307ecc27..b07982305 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -10,33 +10,38 @@
service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"
pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
project_id: "{{ lookup('env', 'gce_project_id') }}"
+ zone: "{{ lookup('env', 'zone') }}"
+ network: "{{ lookup('env', 'network') }}"
+# unsupported in 1.9.+
+ #service_account_permissions: "datastore,logging-write"
tags:
- created-by-{{ lookup('env', 'LOGNAME') |default(cluster, true) }}
- env-{{ cluster }}
- host-type-{{ type }}
- - sub-host-type-{{ sub_host_type }}
+ - sub-host-type-{{ g_sub_host_type }}
- env-host-type-{{ cluster }}-openshift-{{ type }}
+ when: instances |length > 0
register: gce
- name: Add new instances to groups and set variables needed
add_host:
hostname: "{{ item.name }}"
- ansible_ssh_host: "{{ item.public_ip }}"
+ ansible_ssh_host: "{{ item.name }}"
ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}"
ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"
gce_public_ip: "{{ item.public_ip }}"
gce_private_ip: "{{ item.private_ip }}"
- with_items: gce.instance_data
+ with_items: gce.instance_data | default([])
- name: Wait for ssh
- wait_for: port=22 host={{ item.public_ip }}
- with_items: gce.instance_data
+ wait_for: port=22 host={{ item.name }}
+ with_items: gce.instance_data | default([])
- name: Wait for user setup
command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.name].ansible_ssh_user }}@{{ item.public_ip }} echo {{ hostvars[item.name].ansible_ssh_user }} user is setup"
register: result
until: result.rc == 0
- retries: 20
- delay: 10
- with_items: gce.instance_data
+ retries: 30
+ delay: 5
+ with_items: gce.instance_data | default([])