Merge pull request #5519 from giuseppe/crio-set-proper-tag

Automatic merge from submit-queue

Detect the proper version of the images when using CRI-O

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

roles/docker/tasks/systemcontainer_crio.yml

@@ -104,7 +104,7 @@
 
     - name: Use RHEL based image when distribution is Red Hat
       set_fact:
-        l_crio_image_prepend: "registry.access.redhat.com"
+        l_crio_image_prepend: "registry.access.redhat.com/openshift3"
         l_crio_image_name: "cri-o"
       when: ansible_distribution == "RedHat"
 

roles/openshift_version/tasks/set_version_containerized.yml

@@ -1,6 +1,6 @@
 ---
 - set_fact:
-    l_use_crio: "{{ openshift_use_crio | default(false) }}"
+    l_use_crio_only: "{{ openshift_use_crio_only | default(false) }}"
 
 - name: Set containerized version to configure if openshift_image_tag specified
   set_fact:
@@ -22,7 +22,9 @@
   command: >
     docker run --rm {{ openshift.common.cli_image }}:latest version
   register: cli_image_version
-  when: openshift_version is not defined
+  when:
+  - openshift_version is not defined
+  - not l_use_crio_only
 
 # Origin latest = pre-release version (i.e. v1.3.0-alpha.1-321-gb095e3a)
 - set_fact:
@@ -31,6 +33,7 @@
   - openshift_version is not defined
   - openshift.common.deployment_type == 'origin'
   - cli_image_version.stdout_lines[0].split('-') | length > 1
+  - not l_use_crio_only
 
 - set_fact:
     openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
@@ -45,14 +48,14 @@
   when:
   - openshift_version is defined
   - openshift_version.split('.') | length == 2
-  - not l_use_crio
+  - not l_use_crio_only
 
 - set_fact:
     openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2][1:] | join('-') if openshift.common.deployment_type == 'origin' else cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
   when:
   - openshift_version is defined
   - openshift_version.split('.') | length == 2
-  - not l_use_crio
+  - not l_use_crio_only
 
 # TODO: figure out a way to check for the openshift_version when using CRI-O.
 # We should do that using the images in the ostree storage so we don't have