diff options
| author | Steve Milner <smilner@redhat.com> | 2017-05-10 09:36:00 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-05-10 09:36:00 -0400 |
| commit | 95db943bd759846ba9753bfc8868abe17e96d2fb (patch) | |
| tree | 49f1cf1359d2ecb94f76eeff09b4fb7f127e1f59 | |
| parent | 87c282b612ee53441e7564f53ac49a1a6624d820 (diff) | |
| download | openshift-95db943bd759846ba9753bfc8868abe17e96d2fb.tar.gz openshift-95db943bd759846ba9753bfc8868abe17e96d2fb.tar.bz2 openshift-95db943bd759846ba9753bfc8868abe17e96d2fb.tar.xz openshift-95db943bd759846ba9753bfc8868abe17e96d2fb.zip | |
Ensure true is lowercase in daemon.json
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 1 | ||||
| -rw-r--r-- | roles/docker/templates/daemon.json | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 722232a9b..a461c479a 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -121,6 +121,7 @@ l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}" l_docker_additional_registries: "{{ docker_additional_registries | default([]) | to_json }}" l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}" + l_docker_selinux_enabled: "{{ docker_selinux_enabled | default(true) | to_json }}" # Configure container-engine using the daemon.json file - name: Configure Container Engine diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index 7ea8164b3..5eb4822e2 100644 --- a/roles/docker/templates/daemon.json +++ b/roles/docker/templates/daemon.json @@ -51,7 +51,7 @@ "path": "/usr/libexec/docker/docker-runc-current" } }, - "selinux-enabled": {{ docker_selinux_enabled|default(true) }}, + "selinux-enabled": {{ l_docker_selinux_enabled }}, "storage-driver": "", "storage-opts": [], "tls": true, |