Merge pull request #5818 from ashcrow/1503860

Automatic merge from submit-queue.

docker: Move enterprise registry from pkg to main

roles/docker/tasks/main.yml

@@ -10,6 +10,15 @@
     l_use_crio: "{{ openshift_use_crio | default(False) }}"
     l_use_crio_only: "{{ openshift_use_crio_only | default(False) }}"
 
+- name: Add enterprise registry, if necessary
+  set_fact:
+    l2_docker_additional_registries: "{{ l2_docker_additional_registries + [openshift_docker_ent_reg] }}"
+  when:
+    - openshift.common.deployment_type == 'openshift-enterprise'
+    - openshift_docker_ent_reg != ''
+    - openshift_docker_ent_reg not in l2_docker_additional_registries
+    - not l_use_crio_only
+
 - name: Use Package Docker if Requested
   include: package_docker.yml
   when:

roles/docker/tasks/package_docker.yml

@@ -52,14 +52,6 @@
     - restart docker
   when: not (os_firewall_use_firewalld | default(False)) | bool
 
-- name: Add enterprise registry, if necessary
-  set_fact:
-    l2_docker_additional_registries: "{{ l2_docker_additional_registries + [openshift_docker_ent_reg] }}"
-  when:
-  - openshift.common.deployment_type == 'openshift-enterprise'
-  - openshift_docker_ent_reg != ''
-  - openshift_docker_ent_reg not in l2_docker_additional_registries
-
 - stat: path=/etc/sysconfig/docker
   register: docker_check