From 19b32d2a2ba68655afed6ba3c2cda3050b9070b4 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 14 Jul 2017 12:33:14 -0400 Subject: inventory: Add use_crio example --- inventory/byo/hosts.origin.example | 6 +++++- inventory/byo/hosts.ose.example | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'inventory') diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index f09c3d255..c9f79d964 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -108,7 +108,11 @@ openshift_release=v3.6 # The following options must not be used # - openshift_docker_options #openshift_docker_use_system_container=False -# Force the registry to use for the system container. By default the registry +# Instead of using docker, replacec it with cri-o +# NOTE: This uses openshift_docker_systemcontainer_image_registry_override as it's override +# just as container-engine does. +#use_crio=False +# Force the registry to use for the docker/crio system container. By default the registry # 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" diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index c4b5da5b8..a4a9cca81 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -108,7 +108,11 @@ openshift_release=v3.6 # The following options must not be used # - openshift_docker_options #openshift_docker_use_system_container=False -# Force the registry to use for the system container. By default the registry +# Install and run cri-o along side docker +# NOTE: This uses openshift_docker_systemcontainer_image_registry_override as it's override +# just as container-engine does. +#use_crio=False +# Force the registry to use for the container-engine/crio system container. By default the registry # 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" -- cgit v1.2.3 From 59c9668c314518762cceb5845998bc9466fa5722 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 31 Jul 2017 08:29:40 +0200 Subject: cri-o: allow to override CRI-O image indipendently from Docker Signed-off-by: Giuseppe Scrivano --- inventory/byo/hosts.origin.example | 1 + inventory/byo/hosts.ose.example | 1 + 2 files changed, 2 insertions(+) (limited to 'inventory') 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" -- cgit v1.2.3 From 6245045546024ea1dbd4635ab4d1d58783c3aa34 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 31 Jul 2017 08:31:00 +0200 Subject: examples: use the correct variable name Signed-off-by: Giuseppe Scrivano --- 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 9237427b5..239727c6e 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -111,7 +111,7 @@ openshift_release=v3.6 # Instead of using docker, replacec it with cri-o # NOTE: This uses openshift_docker_systemcontainer_image_registry_override as it's override # just as container-engine does. -#use_crio=False +#openshift_docker_use_crio=False # Force the registry to use for the docker/crio system container. By default the registry # 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! diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 9c710bb0a..837c54f27 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -111,7 +111,7 @@ openshift_release=v3.6 # Install and run cri-o along side docker # NOTE: This uses openshift_docker_systemcontainer_image_registry_override as it's override # just as container-engine does. -#use_crio=False +#openshift_docker_use_crio=False # Force the registry to use for the container-engine/crio system container. By default the registry # 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! -- cgit v1.2.3