summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-12-16 14:14:42 -0500
committerScott Dodson <sdodson@redhat.com>2015-12-16 14:14:42 -0500
commit48778f29f265380a3e6fa2e882621ebc3781736b (patch)
tree72f5ff520cd5d5bc3594ece643b77bcde7a712f9 /roles/openshift_cli
parent5e2e55e4aa09468a054ce7c9901c51d9563cc85a (diff)
downloadopenshift-48778f29f265380a3e6fa2e882621ebc3781736b.tar.gz
openshift-48778f29f265380a3e6fa2e882621ebc3781736b.tar.bz2
openshift-48778f29f265380a3e6fa2e882621ebc3781736b.tar.xz
openshift-48778f29f265380a3e6fa2e882621ebc3781736b.zip
Add some guards to wait for images to be pulled before moving on
Diffstat (limited to 'roles/openshift_cli')
-rw-r--r--roles/openshift_cli/tasks/main.yml16
1 files changed, 16 insertions, 0 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index c0ea66e70..8d7686ffd 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -8,10 +8,26 @@
yum: pkg={{ openshift.common.service_type }}-clients state=installed
when: not openshift.common.is_containerized | bool
+- name: List Docker images
+ command: >
+ docker images
+ register: docker_images
+
- name: Pull CLI Image
command: >
docker pull {{ openshift.common.cli_image }}
+ when: openshift.common.is_containerized | bool and openshift.common.cli_image not in docker_images.stdout
+
+- name: Wait for CLI image
+ command: >
+ docker images
+ register: docker_images
+ until: openshift.common.cli_image in docker_images.stdout
+ retries: 30
+ delay: 10
+ changed_when: false
when: openshift.common.is_containerized | bool
+
- name: Create /usr/local/bin/openshift cli wrapper
template: