From e6001c7b092f818585bdf7bd188ea4a10ee1f40d Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Mon, 11 Sep 2017 10:15:57 -0400 Subject: 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 --- inventory/byo/hosts.origin.example | 2 +- inventory/byo/hosts.ose.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'inventory') 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" -- cgit v1.2.3