diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-07 04:17:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 04:17:32 -0400 |
| commit | aad4ccce7ce6641d3c720507568f6da779a66995 (patch) | |
| tree | 12cb3fe5ffb08570a59d85cbe9d5e811369fbf43 | |
| parent | ce52a1f49221aecc8e0dd5170d71976d7a2db5de (diff) | |
| parent | 248484c65cedc65ca3a0f7c3ef021d7b34a5272b (diff) | |
| download | openshift-aad4ccce7ce6641d3c720507568f6da779a66995.tar.gz openshift-aad4ccce7ce6641d3c720507568f6da779a66995.tar.bz2 openshift-aad4ccce7ce6641d3c720507568f6da779a66995.tar.xz openshift-aad4ccce7ce6641d3c720507568f6da779a66995.zip | |
Merge pull request #5310 from ashcrow/split-rhel-centos-crio
Merged by openshift-bot
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 451b8498f..24ca0d9f8 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -97,10 +97,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 |