summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/tasks
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-02 12:04:57 +0000
committerR-Box (From GCE rbox spawner) <rbox@amadeus.com>2015-10-02 12:05:15 +0000
commit59fb7879501d702bb78a1d79326408b115a63c90 (patch)
tree1f80d75723bcd4afc859f1b6608b4947da50ae1a /playbooks/gce/openshift-cluster/tasks
parentb8dcab08624bfdc4e89a144b82caa68883d1f861 (diff)
downloadopenshift-59fb7879501d702bb78a1d79326408b115a63c90.tar.gz
openshift-59fb7879501d702bb78a1d79326408b115a63c90.tar.bz2
openshift-59fb7879501d702bb78a1d79326408b115a63c90.tar.xz
openshift-59fb7879501d702bb78a1d79326408b115a63c90.zip
openshift master public api url defaults to None, it will get its default value in openshift_facts
commented infra-node code until it's solved
Diffstat (limited to 'playbooks/gce/openshift-cluster/tasks')
-rw-r--r--playbooks/gce/openshift-cluster/tasks/launch_instances.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index f569b2a37..b07982305 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -20,6 +20,7 @@
- host-type-{{ 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
@@ -31,11 +32,11 @@
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.name }}
- with_items: gce.instance_data
+ 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"
@@ -43,4 +44,4 @@
until: result.rc == 0
retries: 30
delay: 5
- with_items: gce.instance_data
+ with_items: gce.instance_data | default([])