summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-06 10:02:02 -0400
committerSteve Milner <smilner@redhat.com>2017-09-06 10:02:02 -0400
commit248484c65cedc65ca3a0f7c3ef021d7b34a5272b (patch)
tree06dc9386eeef9ef7ffab0cf1f2967b5910fae27b
parent89c58144a6c92c424a8aa968aa0409e9f936b3a6 (diff)
downloadopenshift-248484c65cedc65ca3a0f7c3ef021d7b34a5272b.tar.gz
openshift-248484c65cedc65ca3a0f7c3ef021d7b34a5272b.tar.bz2
openshift-248484c65cedc65ca3a0f7c3ef021d7b34a5272b.tar.xz
openshift-248484c65cedc65ca3a0f7c3ef021d7b34a5272b.zip
cri-o: Split RHEL and CentOS images
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 787f51f94..8f81273e5 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -88,10 +88,16 @@
l_crio_image_prepend: "docker.io/gscrivano"
l_crio_image_name: "crio-o-fedora"
- - name: Use Centos based image when distribution is Red Hat or CentOS
+ - name: Use Centos based image when distribution is CentOS
set_fact:
l_crio_image_name: "cri-o-centos"
- when: ansible_distribution in ['RedHat', 'CentOS']
+ when: ansible_distribution == "CentOS"
+
+ - name: Use RHEL based image when distribution is Red Hat
+ set_fact:
+ l_crio_image_prepend: "registry.access.redhat.com"
+ l_crio_image_name: "cri-o"
+ when: ansible_distribution == "RedHat"
# For https://github.com/openshift/openshift-ansible/pull/4049#discussion_r114478504
- name: Use a testing registry if requested