diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-07-12 16:08:27 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-07-18 10:26:51 -0400 |
| commit | 340696553e1097d86d173de8413d7b985be62dec (patch) | |
| tree | 26d43b105a6c0ae379a57107f590056170b0b0d4 /inventory | |
| parent | 8d9c90f827b0042465cf96ea10eb170a6bae3107 (diff) | |
| download | openshift-340696553e1097d86d173de8413d7b985be62dec.tar.gz openshift-340696553e1097d86d173de8413d7b985be62dec.tar.bz2 openshift-340696553e1097d86d173de8413d7b985be62dec.tar.xz openshift-340696553e1097d86d173de8413d7b985be62dec.zip | |
docker: fix docker_selinux_enabled
Document the option so that those who want to run on OverlayFS can find
it. Fix the task so that setting it to False isn't interpreted as true.
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 5 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 474f2cc84..01adc8148 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 cde35499a..bd791429c 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" |