summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-07-14 12:33:14 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:51 +0200
commit19b32d2a2ba68655afed6ba3c2cda3050b9070b4 (patch)
tree0209d9eb32f91fa25a665e8fbd48615fe0c658f4
parente781e4cb8be85e201ad6e20ddd70401318846323 (diff)
downloadopenshift-19b32d2a2ba68655afed6ba3c2cda3050b9070b4.tar.gz
openshift-19b32d2a2ba68655afed6ba3c2cda3050b9070b4.tar.bz2
openshift-19b32d2a2ba68655afed6ba3c2cda3050b9070b4.tar.xz
openshift-19b32d2a2ba68655afed6ba3c2cda3050b9070b4.zip
inventory: Add use_crio example
-rw-r--r--inventory/byo/hosts.origin.example6
-rw-r--r--inventory/byo/hosts.ose.example6
2 files changed, 10 insertions, 2 deletions
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"