summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/tasks
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-08-18 10:46:23 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 13:49:10 +0200
commita22fbd327ab9decda9543d47c1ba375b9faecffd (patch)
tree8c1c0cb011980a015fd798612777eece523b5753 /playbooks/gce/openshift-cluster/tasks
parent6f5fff8a542d544916427ce625fe46ec31fa76d3 (diff)
downloadopenshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.gz
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.bz2
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.xz
openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.zip
GCE-support (more information in PR, README_GCE.md)
Diffstat (limited to 'playbooks/gce/openshift-cluster/tasks')
-rw-r--r--playbooks/gce/openshift-cluster/tasks/launch_instances.yml14
1 files changed, 9 insertions, 5 deletions
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index 6307ecc27..f569b2a37 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -10,18 +10,22 @@
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 }}
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(',') }}"
@@ -30,13 +34,13 @@
with_items: gce.instance_data
- name: Wait for ssh
- wait_for: port=22 host={{ item.public_ip }}
+ wait_for: port=22 host={{ item.name }}
with_items: gce.instance_data
- 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
+ retries: 30
+ delay: 5
with_items: gce.instance_data