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/systemcontainercustom.conf.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roles/docker/templates/systemcontainercustom.conf.j2')

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