summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--inventory/byo/hosts.origin.example1
-rw-r--r--inventory/byo/hosts.ose.example1
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml6
3 files changed, 5 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index c9f79d964..9237427b5 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -116,6 +116,7 @@ openshift_release=v3.6
# will be built off of the deployment type and ansible_distribution. Only
# use this option if you are sure you know what you are doing!
#openshift_docker_systemcontainer_image_registry_override="registry.example.com"
+#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"
#openshift_docker_options="-l warn --ipv6=false"
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index a4a9cca81..9c710bb0a 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -116,6 +116,7 @@ openshift_release=v3.6
# will be built off of the deployment type and ansible_distribution. Only
# use this option if you are sure you know what you are doing!
#openshift_docker_systemcontainer_image_registry_override="registry.example.com"
+#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"
#openshift_docker_options="-l warn --ipv6=false"
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: