diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-03 08:41:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 08:41:23 -0700 |
| commit | ee0a668a8848b6d707a57de1b908584cf0b28d5d (patch) | |
| tree | 4443fac17c743ade86d6a8280ea54e5633f80709 /roles/docker/tasks/systemcontainer_crio.yml | |
| parent | 04a17c28991a7f3c2cdade24b4aed4313616cfec (diff) | |
| parent | 1f2325aa3d07679f842dc106a3cb2048564b9539 (diff) | |
| download | openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.gz openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.bz2 openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.tar.xz openshift-ee0a668a8848b6d707a57de1b908584cf0b28d5d.zip | |
Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-ose
Automatic merge from submit-queue.
CRI-O, Docker: set the tag to the OpenShift release on RHEL
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
Diffstat (limited to 'roles/docker/tasks/systemcontainer_crio.yml')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 66ce475e1..386369d26 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -1,4 +1,5 @@ --- + # TODO: Much of this file is shared with container engine tasks - set_fact: l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}" @@ -92,16 +93,24 @@ - block: - - name: Set to default prepend + - name: Set CRI-O image defaults set_fact: l_crio_image_prepend: "docker.io/gscrivano" l_crio_image_name: "cri-o-fedora" + l_crio_image_tag: "latest" - name: Use Centos based image when distribution is CentOS set_fact: l_crio_image_name: "cri-o-centos" when: ansible_distribution == "CentOS" + - name: Set CRI-O image tag + set_fact: + l_crio_image_tag: "{{ openshift_image_tag }}" + when: + - openshift_deployment_type == 'openshift-enterprise' + - openshift_image_tag is defined + - name: Use RHEL based image when distribution is Red Hat set_fact: l_crio_image_prepend: "registry.access.redhat.com/openshift3" @@ -110,7 +119,7 @@ - name: Set the full image name set_fact: - l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:latest" + l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:{{ l_crio_image_tag }}" # For https://github.com/openshift/aos-cd-jobs/pull/624#pullrequestreview-61816548 - name: Use a specific image if requested |