From e360372dcaf78648a329ce16f9d0365eed6636c8 Mon Sep 17 00:00:00 2001
From: Gan Huang <ghuang@redhat.com>
Date: Fri, 5 May 2017 18:18:41 +0800
Subject: Fix 1448368, and some other minors issues

---
 roles/docker/templates/daemon.json                   | 4 +++-
 roles/docker/templates/systemcontainercustom.conf.j2 | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'roles/docker/templates')

diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json
index bd085d2be..30a1b30f4 100644
--- a/roles/docker/templates/daemon.json
+++ b/roles/docker/templates/daemon.json
@@ -34,7 +34,9 @@
     "ip-masq": false,
     "labels": [],
     "live-restore": true,
+{% if docker_log_driver is defined  %}
     "log-driver": "{{ docker_log_driver }}",
+{% endif %}
     "log-level": "",
     "log-opts": {{ docker_log_options|default({}) }},
     "max-concurrent-downloads": 3,
@@ -59,6 +61,6 @@
     "tlsverify": true,
     "userns-remap": "",
     "add-registry": {{  docker_additional_registries|default([]) }},
-    "blocked-registries": {{ docker_blocked_registries|defaukt([]) }},
+    "blocked-registries": {{ docker_blocked_registries|default([]) }},
     "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"
 }
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2
index a2cfed8a9..a4fb01d2b 100644
--- a/roles/docker/templates/systemcontainercustom.conf.j2
+++ b/roles/docker/templates/systemcontainercustom.conf.j2
@@ -1,13 +1,13 @@
 # {{ ansible_managed }}
 
 [Service]
-{%- if docker_http_proxy %}
+{%- if "http_proxy" in openshift.common %}
 ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }}
 {%- endif -%}
-{%- if docker_https_proxy %}
+{%- if "https_proxy" in openshift.common %}
 ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }}
 {%- endif -%}
-{%- if docker_no_proxy %}
+{%- if "no_proxy" in openshift.common %}
 ENVIRONMENT=NO_PROXY={{ docker_no_proxy }}
 {%- endif %}
 {%- if os_firewall_use_firewalld|default(true) %}
-- 
cgit v1.2.3