summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-09 14:55:04 -0800
committerGitHub <noreply@github.com>2018-02-09 14:55:04 -0800
commite0f0c9f85c6cd18cfac505394ac84926c4629c4c (patch)
tree155912e16881a2d9c6a28f413c03ea9286d2d722
parent401832979e466d8e1094d56f1e08c3f842393ee7 (diff)
parentefb0a82600bc6db89059ddf78f0d4599fd47d55b (diff)
downloadopenshift-e0f0c9f85c6cd18cfac505394ac84926c4629c4c.tar.gz
openshift-e0f0c9f85c6cd18cfac505394ac84926c4629c4c.tar.bz2
openshift-e0f0c9f85c6cd18cfac505394ac84926c4629c4c.tar.xz
openshift-e0f0c9f85c6cd18cfac505394ac84926c4629c4c.zip
Merge pull request #7086 from spadgett/pause-for-console-deployment
Automatic merge from submit-queue. Pause for console rollout /assign @sdodson
-rw-r--r--roles/openshift_web_console/tasks/install.yml11
1 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_web_console/tasks/install.yml b/roles/openshift_web_console/tasks/install.yml
index f79a05c94..13726da45 100644
--- a/roles/openshift_web_console/tasks/install.yml
+++ b/roles/openshift_web_console/tasks/install.yml
@@ -20,6 +20,7 @@
state: present
node_selector:
- ""
+ register: create_console_project
- name: Make temp directory for web console templates
command: mktemp -d /tmp/console-ansible-XXXXXX
@@ -144,6 +145,16 @@
--config={{ mktemp.stdout }}/admin.kubeconfig
| {{ openshift_client_binary }} apply --config={{ mktemp.stdout }}/admin.kubeconfig -f -
+# Wait to give the rollout time to start before verifying that the console is
+# running. Unfortunately, we can't check if the deployment revision changed
+# because it's possible applying the template did not result in any changes to
+# the pod template spec, which would skip a new revision.
+- name: Pause for the web console deployment to start
+ pause:
+ seconds: 30
+ # Skip if the project didn't exist since there was no previous deployment.
+ when: not create_console_project.changed
+
- name: Verify that the web console is running
command: >
curl -k https://webconsole.openshift-web-console.svc/healthz