summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-26 02:55:50 -0700
committerGitHub <noreply@github.com>2017-09-26 02:55:50 -0700
commitfa83e187398b03cb8118234cb92f42c200c5e227 (patch)
tree8d064b36befc6d15f203fae655f5ac6df12c9099 /roles/docker
parentc16d16d082ae992df3dd63d120622d9179371b17 (diff)
parentf54d66febe0612a175d6e992d694ff0c2aeb6f97 (diff)
downloadopenshift-fa83e187398b03cb8118234cb92f42c200c5e227.tar.gz
openshift-fa83e187398b03cb8118234cb92f42c200c5e227.tar.bz2
openshift-fa83e187398b03cb8118234cb92f42c200c5e227.tar.xz
openshift-fa83e187398b03cb8118234cb92f42c200c5e227.zip
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
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index e6fc2db06..5b02b72be 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/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"