summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws/tasks/provision_nodes.yml
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-11-08 18:20:46 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-11-29 21:22:39 -0500
commit6154f7d49847813dfdea9ad73aaaed86f18aa9de (patch)
tree50d571bb23627660e3f31854f513d9a044cc2178 /roles/openshift_aws/tasks/provision_nodes.yml
parent6b6b422245be79dd3eec0c93a58875c646bbfba7 (diff)
downloadopenshift-6154f7d49847813dfdea9ad73aaaed86f18aa9de.tar.gz
openshift-6154f7d49847813dfdea9ad73aaaed86f18aa9de.tar.bz2
openshift-6154f7d49847813dfdea9ad73aaaed86f18aa9de.tar.xz
openshift-6154f7d49847813dfdea9ad73aaaed86f18aa9de.zip
Initial upgrade for scale groups.
Diffstat (limited to 'roles/openshift_aws/tasks/provision_nodes.yml')
-rw-r--r--roles/openshift_aws/tasks/provision_nodes.yml32
1 files changed, 6 insertions, 26 deletions
diff --git a/roles/openshift_aws/tasks/provision_nodes.yml b/roles/openshift_aws/tasks/provision_nodes.yml
index 1b40f24d3..3e84666a2 100644
--- a/roles/openshift_aws/tasks/provision_nodes.yml
+++ b/roles/openshift_aws/tasks/provision_nodes.yml
@@ -12,7 +12,9 @@
register: instancesout
retries: 20
delay: 3
- until: instancesout.instances|length > 0
+ until:
+ - "'instances' in instancesout"
+ - instancesout.instances|length > 0
- name: slurp down the bootstrap.kubeconfig
slurp:
@@ -42,29 +44,7 @@
l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups_extra }}"
l_aws_ami_map: "{{ openshift_aws_ami_map_extra }}"
-
+# instances aren't scaling fast enough here, we need to wait for them
- when: openshift_aws_wait_for_ssh | bool
- block:
- - name: pause and allow for instances to scale before we query them
- pause:
- seconds: 10
-
- - name: fetch newly created instances
- ec2_remote_facts:
- region: "{{ openshift_aws_region }}"
- filters:
- "tag:clusterid": "{{ openshift_aws_clusterid }}"
- "tag:host-type": node
- instance-state-name: running
- register: instancesout
- retries: 20
- delay: 3
- until: instancesout.instances|length > 0
-
- - name: wait for ssh to become available
- wait_for:
- port: 22
- host: "{{ item.public_ip_address }}"
- timeout: 300
- search_regex: OpenSSH
- with_items: "{{ instancesout.instances }}"
+ name: wait for our new nodes to come up
+ include: wait_for_groups.yml