diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-07-27 09:20:10 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-03 17:20:52 +0200 |
| commit | 72eaf22e58299e6584b026afb609266835177175 (patch) | |
| tree | 16cbf253ccbfe2d959b80559e8ab8b37f7580a47 /roles/docker/tasks | |
| parent | 5e218e1a1df44897b46f5467e14c97d0155bae97 (diff) | |
| download | openshift-72eaf22e58299e6584b026afb609266835177175.tar.gz openshift-72eaf22e58299e6584b026afb609266835177175.tar.bz2 openshift-72eaf22e58299e6584b026afb609266835177175.tar.xz openshift-72eaf22e58299e6584b026afb609266835177175.zip | |
cri-o: use only images from Docker Hub
For the time being it won't be added to the Red Hat registry, so use
only what is available on Docker Hub.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 21fc703fe..cfc9157cc 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -85,17 +85,13 @@ - name: Set to default prepend set_fact: - l_crio_image_prepend: "gscrivano" + l_crio_image_prepend: "docker.io/gscrivano" + l_crio_image_name: "crio-o-fedora" - - name: Use Red Hat Registry for image when distribution is Red Hat + - name: Use Centos based image when distribution is Red Hat or CentOS set_fact: - l_crio_image_prepend: "registry.access.redhat.com/openshift3" - when: ansible_distribution == 'RedHat' - - - name: Use Fedora Registry for image when distribution is Fedora - set_fact: - l_crio_image_prepend: "registry.fedoraproject.org/f25" - when: ansible_distribution == 'Fedora' + l_crio_image_name: "cri-o-centos" + when: ansible_distribution in ['RedHat', 'CentOS'] # For https://github.com/openshift/openshift-ansible/pull/4049#discussion_r114478504 - name: Use a testing registry if requested @@ -107,7 +103,7 @@ - name: Set the full image name set_fact: - l_crio_image: "{{ l_crio_image_prepend }}/cri-o:latest" + l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:latest" # NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released - name: Pre-pull CRI-O System Container image |