diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 13:49:32 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 13:49:32 -0500 |
| commit | 6d2e202d514784df66b4f663ae725da7ef4499ae (patch) | |
| tree | 8e6d6287ce843d4f74ecc8e5db0b3e9da9326654 /roles/openshift_cli | |
| parent | 7c48bcc8a708828ff78a4b239eca6cf60531f5e2 (diff) | |
| parent | 8be4562550db9285039738173607cce446979190 (diff) | |
| download | openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.gz openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.bz2 openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.tar.xz openshift-6d2e202d514784df66b4f663ae725da7ef4499ae.zip | |
Merge pull request #1097 from sdodson/containers
Always pull images
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 8d7686ffd..2b53c9b8e 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -3,32 +3,17 @@ role: common local_facts: deployment_type: "{{ openshift_deployment_type }}" + cli_image: "{{ osm_image | default(None) }}" - name: Install clients 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: src: openshift.j2 |