summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-09-19 12:30:20 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-10-23 11:25:56 +0200
commit26a0c901536775b5a0d917d8723156cdb19f05d1 (patch)
tree117f5e117f871e46eeb13aa50d5f27b383799a97 /roles
parent1a0f460eb67f1a6fa82385faa91df4edd4b9d7d3 (diff)
downloadopenshift-26a0c901536775b5a0d917d8723156cdb19f05d1.tar.gz
openshift-26a0c901536775b5a0d917d8723156cdb19f05d1.tar.bz2
openshift-26a0c901536775b5a0d917d8723156cdb19f05d1.tar.xz
openshift-26a0c901536775b5a0d917d8723156cdb19f05d1.zip
cli: do not pull again the image when using Docker
When CRI-O is used and the CLI image is already pulled into Docker then use it also for copying the CLI files to the host instead of pulling it once again in the ostree storage. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_cli/tasks/main.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index 9e61805f9..4baa24027 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -1,6 +1,9 @@
---
- set_fact:
- l_use_crio: "{{ openshift_use_crio | default(false) }}"
+ l_use_crio_only: "{{ openshift_use_crio_only | default(false) }}"
+ l_is_system_container_image: "{{ openshift_use_master_system_container | default(openshift_use_system_containers | default(false)) | bool }}"
+- set_fact:
+ l_use_cli_atomic_image: "{{ l_use_crio_only or l_is_system_container_image }}"
- name: Install clients
package: name={{ openshift.common.service_type }}-clients state=present
@@ -20,7 +23,7 @@
backend: "docker"
when:
- openshift.common.is_containerized | bool
- - not l_use_crio
+ - not l_use_cli_atomic_image | bool
- block:
- name: Pull CLI Image
@@ -36,7 +39,7 @@
backend: "atomic"
when:
- openshift.common.is_containerized | bool
- - l_use_crio
+ - l_use_cli_atomic_image | bool
- name: Reload facts to pick up installed OpenShift version
openshift_facts: