From 9e9dc2260ee0175bbef2bb2714e5201d0d9683c2 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 17 May 2017 11:53:22 +0200
Subject: systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENT
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1451187
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/docker/templates/systemcontainercustom.conf.j2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'roles/docker/templates')
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2
index b727c57d4..86eebfba6 100644
--- a/roles/docker/templates/systemcontainercustom.conf.j2
+++ b/roles/docker/templates/systemcontainercustom.conf.j2
@@ -2,13 +2,13 @@
[Service]
{% if "http_proxy" in openshift.common %}
-ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }}
+Environment=HTTP_PROXY={{ docker_http_proxy }}
{% endif -%}
{% if "https_proxy" in openshift.common %}
-ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }}
+Environment=HTTPS_PROXY={{ docker_http_proxy }}
{% endif -%}
{% if "no_proxy" in openshift.common %}
-ENVIRONMENT=NO_PROXY={{ docker_no_proxy }}
+Environment=NO_PROXY={{ docker_no_proxy }}
{% endif %}
{%- if os_firewall_use_firewalld|default(false) %}
[Unit]
--
cgit v1.2.3