summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-11 10:15:57 -0400
committerSteve Milner <smilner@redhat.com>2017-09-12 09:32:02 -0400
commite6001c7b092f818585bdf7bd188ea4a10ee1f40d (patch)
treea373c1c25a39951ac346cec24f0350e6d064a3c2 /inventory
parentf4a328ad2dc1d1ba93efa15ac0bf4502bad40079 (diff)
downloadopenshift-e6001c7b092f818585bdf7bd188ea4a10ee1f40d.tar.gz
openshift-e6001c7b092f818585bdf7bd188ea4a10ee1f40d.tar.bz2
openshift-e6001c7b092f818585bdf7bd188ea4a10ee1f40d.tar.xz
openshift-e6001c7b092f818585bdf7bd188ea4a10ee1f40d.zip
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 'inventory')
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index dbe57bbd2..d7aedb691 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -119,7 +119,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_override="registry.example.com/container-engine:latest"
-#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
+#openshift_crio_systemcontainer_image_override="registry.example.com/cri-o:latest"
# 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 0d60de6d2..edee3e86d 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -119,7 +119,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_override="registry.example.com/container-engine:latest"
-#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
+#openshift_crio_systemcontainer_image_override="registry.example.com/cri-o:latest"
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"
#openshift_docker_options="-l warn --ipv6=false"