summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-03 07:30:29 -0700
committerGitHub <noreply@github.com>2017-11-03 07:30:29 -0700
commitc99bfde17bca322e8a89ba3e9dc4e4fdc2776448 (patch)
treec6e36f2b07ee6699e50065bb55f5d0e41da0a1fc /inventory/byo
parent1b24db1dfb82b2b99605fdfc016c59161981d487 (diff)
parentb88adec6c15157c2894ccfe2ac855e67fb48ca33 (diff)
downloadopenshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.gz
openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.bz2
openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.tar.xz
openshift-c99bfde17bca322e8a89ba3e9dc4e4fdc2776448.zip
Merge pull request #5995 from ashcrow/docker-gc-daemonset
Automatic merge from submit-queue. openshift_hosted: Add docker-gc Two new inventory variables have been created: - ``openshift_crio_enable_docker_gc``: Enable docker_gc daemon set - ``openshift_crio_docker_gc_node_selector``: Optional dictionary to use node selector When ``openshift_crio_enable_docker_gc`` and ``openshift_use_crio`` are both true then ``docker_gc`` daemonset will be created along with adding a ``docker-gc`` sa.
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.example9
1 files changed, 9 insertions, 0 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index e49dd5fa2..5de43270e 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -123,6 +123,15 @@ openshift_release=v3.7
# 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_override="registry.example.com/cri-o:latest"
+# NOTE: The following crio docker-gc items are tech preview and likely shouldn't be used
+# unless you know what you are doing!!
+# The following two variables are used when opneshift_use_crio is True
+# and cleans up after builds that pass through docker.
+# Enable docker garbage collection when using cri-o
+#openshift_crio_enable_docker_gc=false
+# Node Selectors to run the garbage collection
+#openshift_crio_docker_gc_node_selector: {'runtime': 'cri-o'}
+
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"
#openshift_docker_options="-l warn --ipv6=false"