From 2fe86fee9758471fd55de2776bf512ddf2a39b8d Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 7 Jan 2016 16:41:37 -0500 Subject: Always pull docker images --- roles/openshift_cli/tasks/main.yml | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'roles/openshift_cli') diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 8d7686ffd..ec77e4ebc 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -8,27 +8,11 @@ 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 -- cgit v1.2.3 From 8be4562550db9285039738173607cce446979190 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 11 Jan 2016 13:02:46 -0500 Subject: Set the cli image to match osm_image in openshift_cli role --- roles/openshift_cli/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_cli') diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index ec77e4ebc..2b53c9b8e 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -3,6 +3,7 @@ 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 -- cgit v1.2.3