summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-07-31 08:29:40 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commit59c9668c314518762cceb5845998bc9466fa5722 (patch)
treec96216783e1ea52248ccb806b4d4b3e2f0fa5450 /roles/docker
parentf0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68 (diff)
downloadopenshift-59c9668c314518762cceb5845998bc9466fa5722.tar.gz
openshift-59c9668c314518762cceb5845998bc9466fa5722.tar.bz2
openshift-59c9668c314518762cceb5845998bc9466fa5722.tar.xz
openshift-59c9668c314518762cceb5845998bc9466fa5722.zip
cri-o: allow to override CRI-O image indipendently from Docker
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index cfc9157cc..f18a5b117 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -96,10 +96,10 @@
# 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_docker_systemcontainer_image_registry_override }}"
+ l_crio_image_prepend: "{{ openshift_crio_systemcontainer_image_registry_override }}"
when:
- - openshift_docker_systemcontainer_image_registry_override is defined
- - openshift_docker_systemcontainer_image_registry_override != ""
+ - openshift_crio_systemcontainer_image_registry_override is defined
+ - openshift_crio_systemcontainer_image_registry_override != ""
- name: Set the full image name
set_fact: