瀏覽代碼

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>
Giuseppe Scrivano 7 年之前
父節點
當前提交
26a0c90153
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      roles/openshift_cli/tasks/main.yml

+ 6 - 3
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: