diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-10-29 16:16:39 -0400 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2017-10-30 23:31:02 -0400 |
| commit | 07a2312baffb85b0f5acc582e00bc22cbc7e5394 (patch) | |
| tree | c7ca4f156a42a6eb9ba4cb643b97d9b50b3aa3d9 /roles/openshift_gcp | |
| parent | e56ac91f1f0a54ca428b7838b0cdf91045ddb8e6 (diff) | |
| download | openshift-07a2312baffb85b0f5acc582e00bc22cbc7e5394.tar.gz openshift-07a2312baffb85b0f5acc582e00bc22cbc7e5394.tar.bz2 openshift-07a2312baffb85b0f5acc582e00bc22cbc7e5394.tar.xz openshift-07a2312baffb85b0f5acc582e00bc22cbc7e5394.zip | |
Allow master node group to wait for stable on GCP
Masters can be in a bootstrap config, but allow them to wait for stable
so that we don't have inventory issues.
Diffstat (limited to 'roles/openshift_gcp')
| -rw-r--r-- | roles/openshift_gcp/templates/provision.j2.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_gcp/templates/provision.j2.sh b/roles/openshift_gcp/templates/provision.j2.sh index 5ed6d9f84..4d150bc74 100644 --- a/roles/openshift_gcp/templates/provision.j2.sh +++ b/roles/openshift_gcp/templates/provision.j2.sh @@ -313,11 +313,11 @@ fi # wait until all node groups are stable {% for node_group in openshift_gcp_node_group_config %} -{% if node_group.bootstrap | default(False) %} -# not waiting for {{ node_group.name }} due to bootstrapping -{% else %} +{% if node_group.wait_for_stable | default(False) or not (node_group.bootstrap | default(False)) %} # wait for stable {{ node_group.name }} ( gcloud --project "{{ openshift_gcp_project }}" compute instance-groups managed wait-until-stable "{{ openshift_gcp_prefix }}ig-{{ node_group.suffix }}" --zone "{{ openshift_gcp_zone }}" --timeout=600 ) & +{% else %} +# not waiting for {{ node_group.name }} due to bootstrapping {% endif %} {% endfor %} |