diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-22 07:33:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 07:33:38 -0700 |
| commit | 5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d (patch) | |
| tree | af2db6c1e630649b5f1e484692a01e31c4093770 /roles/docker | |
| parent | 91c1c6fc7323ca885956102248b2e5b18e5332c3 (diff) | |
| parent | e6001c7b092f818585bdf7bd188ea4a10ee1f40d (diff) | |
| download | openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.gz openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.bz2 openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.tar.xz openshift-5b1bb00a2f02e51ab493e86eb4d8b6e264e3268d.zip | |
Merge pull request #5354 from ashcrow/crio-systemcontainer-image-override
Automatic merge from submit-queue
cri-o: Allow full image override
``openshift_crio_systemcontainer_image_registry_override`` has been replaced
with ``openshift_crio_systemcontainer_image_override``. The difference is
``openshift_crio_systemcontainer_image_override`` takes a full image path
including the tag.
Example:
```
openshift_crio_systemcontainer_image_override=gscrivano/cri-o-centos:latest
```
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 8208fa68d..e6fc2db06 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -108,18 +108,22 @@ 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 - set_fact: - l_crio_image_prepend: "{{ openshift_crio_systemcontainer_image_registry_override }}" - when: - - openshift_crio_systemcontainer_image_registry_override is defined - - openshift_crio_systemcontainer_image_registry_override != "" - - name: Set the full image name set_fact: l_crio_image: "{{ l_crio_image_prepend }}/{{ l_crio_image_name }}:latest" + # For https://github.com/openshift/aos-cd-jobs/pull/624#pullrequestreview-61816548 + - name: Use a specific image if requested + set_fact: + l_crio_image: "{{ openshift_crio_systemcontainer_image_override }}" + when: + - openshift_crio_systemcontainer_image_override is defined + - openshift_crio_systemcontainer_image_override != "" + + # Be nice and let the user see the variable result + - debug: + var: l_crio_image + # 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 command: "atomic pull --storage ostree {{ l_crio_image }}" |