Merge pull request #10402 from vrutkovs/prepull-crio

Make sure images are prepulled when CRIO is used

roles/etcd/tasks/static.yml

@@ -7,8 +7,7 @@
   register: etcd_image_exists
 
 - name: Pre-pull etcd image
-  docker_image:
-    name: "{{ etcd_image }}"
+  command: "{{ openshift_container_cli }} pull {{ etcd_image }}"
   environment:
     NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
   when: etcd_image_exists.stdout_lines == []

roles/openshift_control_plane/tasks/pre_pull.yml

@@ -4,9 +4,8 @@
   register: control_plane_image
 
 # This task runs async to save time while the master is being configured
-- name: Pre-pull Origin image
-  docker_image:
-    name: "{{ osm_image }}"
+- name: Pre-pull Origin image (docker)
+  command: "{{ openshift_container_cli }} pull {{ osm_image }}"
   environment:
     NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
   when: control_plane_image.stdout_lines == []

roles/openshift_node/tasks/prepull.yml

@@ -21,8 +21,7 @@
 
 # This task runs async to save time while other downloads proceed
 - name: pre-pull pod image
-  docker_image:
-    name: "{{ osn_pod_image }}"
+  command: "{{ openshift_container_cli }} pull {{ osn_pod_image }}"
   environment:
     NO_PROXY: "{{ openshift.common.no_proxy | default('') }}"
   when: pod_image.stdout_lines == []