From 9c29b47f788b588d6f126a73e4eb03839cfb848f Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 6 Dec 2017 13:52:42 +0100
Subject: container-engine: log-opts is a dictionary in the daemon.json file
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/container_runtime/templates/daemon.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/container_runtime/templates')
diff --git a/roles/container_runtime/templates/daemon.json b/roles/container_runtime/templates/daemon.json
index 383963bd3..7c35d3080 100644
--- a/roles/container_runtime/templates/daemon.json
+++ b/roles/container_runtime/templates/daemon.json
@@ -8,7 +8,7 @@
{% if openshift_docker_log_driver is defined %}
"log-driver": "{{ openshift_docker_log_driver }}",
{%- endif %}
- "log-opts": {{ l_docker_log_options }},
+ "log-opts": {{ l_docker_log_options_dict }},
"runtimes": {
"oci": {
"path": "/usr/libexec/docker/docker-runc-current"
--
cgit v1.2.3
From 5431d1228d795cf6d0f5087779ad9136b847f428 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 6 Dec 2017 15:52:40 +0100
Subject: container-engine: skip openshift_docker_log_driver when it is False
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/container_runtime/templates/daemon.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/container_runtime/templates')
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 }},
--
cgit v1.2.3