summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-20 08:47:20 -0400
committerGitHub <noreply@github.com>2017-07-20 08:47:20 -0400
commita6a0621d7b21e04c278f0a79e2c30dfec7b261d8 (patch)
tree9051e8ffa2cc73ef918044040f96d8f16d0cbc3a /inventory/byo
parente432f8a35323e8603f0f58b70d996f7487703ec1 (diff)
parent2b1c7492c3c8400370bf675c93cc9ba4b4f83427 (diff)
downloadopenshift-a6a0621d7b21e04c278f0a79e2c30dfec7b261d8.tar.gz
openshift-a6a0621d7b21e04c278f0a79e2c30dfec7b261d8.tar.bz2
openshift-a6a0621d7b21e04c278f0a79e2c30dfec7b261d8.tar.xz
openshift-a6a0621d7b21e04c278f0a79e2c30dfec7b261d8.zip
Merge pull request #4757 from sosiouxme/20170703-docker-storage-overlay2
openshift_checks/docker_storage: overlay/2 support
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.origin.example5
-rw-r--r--inventory/byo/hosts.ose.example5
2 files changed, 10 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 93e821ba7..6e53b4fd9 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -113,6 +113,11 @@ openshift_release=v3.6
# Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10.
# docker_version="1.12.1"
+# Specify whether to run Docker daemon with SELinux enabled in containers. Default is True.
+# Uncomment below to disable; for example if your kernel does not support the
+# Docker overlay/overlay2 storage drivers with SELinux enabled.
+#openshift_docker_selinux_enabled=False
+
# Skip upgrading Docker during an OpenShift upgrade, leaves the current Docker version alone.
# docker_upgrade=False
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 9a0dce01b..e3e9220fc 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -109,6 +109,11 @@ openshift_release=v3.6
# Default value: "--log-driver=journald"
#openshift_docker_options="-l warn --ipv6=false"
+# Specify whether to run Docker daemon with SELinux enabled in containers. Default is True.
+# Uncomment below to disable; for example if your kernel does not support the
+# Docker overlay/overlay2 storage drivers with SELinux enabled.
+#openshift_docker_selinux_enabled=False
+
# Specify exact version of Docker to configure or upgrade to.
# Downgrades are not supported and will error out. Be careful when upgrading docker from < 1.10 to > 1.10.
# docker_version="1.12.1"