diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-11 23:28:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 23:28:33 -0400 |
| commit | 555503784981589562a281e0d96ed89114a02e61 (patch) | |
| tree | 0757d1fbb6cb099b70798425bd3dfa2e218ffcb2 /roles/docker | |
| parent | 33d254a4907e15d4abd9d51aad4bed03a100e9e3 (diff) | |
| parent | ab973c72397d8890465cf9c315b79d2ec73d4a62 (diff) | |
| download | openshift-555503784981589562a281e0d96ed89114a02e61.tar.gz openshift-555503784981589562a281e0d96ed89114a02e61.tar.bz2 openshift-555503784981589562a281e0d96ed89114a02e61.tar.xz openshift-555503784981589562a281e0d96ed89114a02e61.zip | |
Merge pull request #5356 from ashcrow/openshift-docker-systemcontainer-image-override
Merged by openshift-bot
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 57a84bc2c..146e5f430 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -100,18 +100,22 @@ l_docker_image_prepend: "registry.fedoraproject.org/f25" when: ansible_distribution == 'Fedora' - # For https://github.com/openshift/openshift-ansible/pull/4049#discussion_r114478504 - - name: Use a testing registry if requested - set_fact: - l_docker_image_prepend: "{{ openshift_docker_systemcontainer_image_registry_override }}" - when: - - openshift_docker_systemcontainer_image_registry_override is defined - - openshift_docker_systemcontainer_image_registry_override != "" - - name: Set the full image name set_fact: l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:latest" + # For https://github.com/openshift/openshift-ansible/pull/5354#issuecomment-328552959 + - name: Use a specific image if requested + set_fact: + l_docker_image: "{{ openshift_docker_systemcontainer_image_override }}" + when: + - openshift_docker_systemcontainer_image_override is defined + - openshift_docker_systemcontainer_image_override != "" + + # Be nice and let the user see the variable result + - debug: + var: l_docker_image + # NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released - name: Pre-pull Container Engine System Container image command: "atomic pull --storage ostree {{ l_docker_image }}" |