diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-01 15:28:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 15:28:49 -0500 |
| commit | 7adf84ed20d2e5feb9b728f7047017179b6dfcee (patch) | |
| tree | 02f002872c2457e7ca4667a2103f7e4ebbcd4869 /roles/openshift_aws/tasks/provision_nodes.yml | |
| parent | e0e10698184c9a7cf4bf65787771686e46d26603 (diff) | |
| parent | 6154f7d49847813dfdea9ad73aaaed86f18aa9de (diff) | |
| download | openshift-7adf84ed20d2e5feb9b728f7047017179b6dfcee.tar.gz openshift-7adf84ed20d2e5feb9b728f7047017179b6dfcee.tar.bz2 openshift-7adf84ed20d2e5feb9b728f7047017179b6dfcee.tar.xz openshift-7adf84ed20d2e5feb9b728f7047017179b6dfcee.zip | |
Merge pull request #6069 from kwoodson/upgrade_scale_groups
Initial upgrade for scale groups.
Diffstat (limited to 'roles/openshift_aws/tasks/provision_nodes.yml')
| -rw-r--r-- | roles/openshift_aws/tasks/provision_nodes.yml | 32 |
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 |