crio: use the image_tag on RHEL

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

roles/docker/tasks/systemcontainer_crio.yml

@@ -1,4 +1,5 @@
 ---
+
 # TODO: Much of this file is shared with container engine tasks
 - set_fact:
     l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(openshift.docker.insecure_registries)) }}"
@@ -92,16 +93,24 @@
 
 - block:
 
-    - name: Set to default prepend
+    - name: Set CRI-O image defaults
       set_fact:
         l_crio_image_prepend: "docker.io/gscrivano"
         l_crio_image_name: "cri-o-fedora"
+        l_crio_image_tag: "latest"
 
     - name: Use Centos based image when distribution is CentOS
       set_fact:
         l_crio_image_name: "cri-o-centos"
       when: ansible_distribution == "CentOS"
 
+    - name: Set CRI-O image tag
+      set_fact:
+        l_crio_image_tag: "{{ openshift_image_tag }}"
+      when:
+        - openshift_deployment_type == 'openshift-enterprise'
+        - openshift_image_tag is defined
+
     - name: Use RHEL based image when distribution is Red Hat
       set_fact:
         l_crio_image_prepend: "registry.access.redhat.com/openshift3"
@@ -110,7 +119,7 @@
 
     - name: Set the full image name
       set_fact:
-        l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:latest"
+        l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:{{ l_crio_image_tag }}"
 
     # For https://github.com/openshift/aos-cd-jobs/pull/624#pullrequestreview-61816548
     - name: Use a specific image if requested