diff options
Diffstat (limited to 'roles/openshift_web_console')
| -rw-r--r-- | roles/openshift_web_console/tasks/install.yml | 11 | ||||
| -rw-r--r-- | roles/openshift_web_console/vars/default_images.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_web_console/vars/openshift-enterprise.yml | 2 |
3 files changed, 13 insertions, 2 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 diff --git a/roles/openshift_web_console/vars/default_images.yml b/roles/openshift_web_console/vars/default_images.yml index 42d331ac5..0bd4e981d 100644 --- a/roles/openshift_web_console/vars/default_images.yml +++ b/roles/openshift_web_console/vars/default_images.yml @@ -1,4 +1,4 @@ --- __openshift_web_console_prefix: "docker.io/openshift/origin-" -__openshift_web_console_version: "latest" +__openshift_web_console_version: "{{ openshift_image_tag }}" __openshift_web_console_image_name: "web-console" diff --git a/roles/openshift_web_console/vars/openshift-enterprise.yml b/roles/openshift_web_console/vars/openshift-enterprise.yml index 375c22067..fd5e4e9a0 100644 --- a/roles/openshift_web_console/vars/openshift-enterprise.yml +++ b/roles/openshift_web_console/vars/openshift-enterprise.yml @@ -1,4 +1,4 @@ --- __openshift_web_console_prefix: "registry.access.redhat.com/openshift3/ose-" -__openshift_web_console_version: "v3.9" +__openshift_web_console_version: "{{ openshift_image_tag }}" __openshift_web_console_image_name: "web-console" |