summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-07-12 16:08:27 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-07-18 10:26:51 -0400
commit340696553e1097d86d173de8413d7b985be62dec (patch)
tree26d43b105a6c0ae379a57107f590056170b0b0d4 /roles/docker/tasks
parent8d9c90f827b0042465cf96ea10eb170a6bae3107 (diff)
downloadopenshift-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 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/package_docker.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index c82d8659a..9859b7b5a 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -93,7 +93,7 @@
dest: /etc/sysconfig/docker
regexp: '^OPTIONS=.*$'
line: "OPTIONS='\
- {% if ansible_selinux.status | default(None) == '''enabled''' and docker_selinux_enabled | default(true) %} --selinux-enabled {% endif %}\
+ {% if ansible_selinux.status | default(None) == 'enabled' and docker_selinux_enabled | default(true) | bool %} --selinux-enabled {% endif %}\
{% if docker_log_driver is defined %} --log-driver {{ docker_log_driver }}{% endif %}\
{% if docker_log_options is defined %} {{ docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}}{% endif %}\
{% if docker_options is defined %} {{ docker_options }}{% endif %}\