summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-12-06 15:52:40 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-12-08 18:41:12 +0100
commit5431d1228d795cf6d0f5087779ad9136b847f428 (patch)
tree136d1ac64f5aac998df7960451f139e472e8d095
parent9c29b47f788b588d6f126a73e4eb03839cfb848f (diff)
downloadopenshift-5431d1228d795cf6d0f5087779ad9136b847f428.tar.gz
openshift-5431d1228d795cf6d0f5087779ad9136b847f428.tar.bz2
openshift-5431d1228d795cf6d0f5087779ad9136b847f428.tar.xz
openshift-5431d1228d795cf6d0f5087779ad9136b847f428.zip
container-engine: skip openshift_docker_log_driver when it is False
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/container_runtime/templates/daemon.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/container_runtime/templates/daemon.json b/roles/container_runtime/templates/daemon.json
index 7c35d3080..1a72d812a 100644
--- a/roles/container_runtime/templates/daemon.json
+++ b/roles/container_runtime/templates/daemon.json
@@ -5,7 +5,7 @@
"disable-legacy-registry": false,
"exec-opts": ["native.cgroupdriver=systemd"],
"insecure-registries": {{ l_docker_insecure_registries }},
-{% if openshift_docker_log_driver is defined %}
+{% if openshift_docker_log_driver %}
"log-driver": "{{ openshift_docker_log_driver }}",
{%- endif %}
"log-opts": {{ l_docker_log_options_dict }},