diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-31 11:33:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 11:33:16 -0700 |
| commit | 4a7f64a2d692ebbeb03d696b648762f4be784f6d (patch) | |
| tree | e2e7b94a738b5dc657b4ee7d00b28f6f7ad60db5 /roles/openshift_gcp/templates/provision.j2.sh | |
| parent | 3e2f7911f08504e7da8344df28f008a81897c329 (diff) | |
| parent | 971e224650387a873e01af29bf135f47ab2f6980 (diff) | |
| download | openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.gz openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.bz2 openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.tar.xz openshift-4a7f64a2d692ebbeb03d696b648762f4be784f6d.zip | |
Merge pull request #5924 from smarterclayton/bootstrap_cleanup
Automatic merge from submit-queue.
GCP cannot use growpart utils from AWS due to conflicting package
Allow cloud provider specific packages to be specified. Also, fix a wait condition in openshift_gcp to allow masters to be bootstrapped nodes.
@kwoodson
Diffstat (limited to 'roles/openshift_gcp/templates/provision.j2.sh')
| -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 %} |