commit 67a8f695322f0cfd0de2d872e76d7867c4a5af64
author Tomas Kukral <tkukral@mirantis.com> Thu Oct 26 07:54:34 2017 +0000
committer Gerrit Code Review <gerrit2@7cd0c2eb159e> Thu Oct 26 07:54:34 2017 +0000
tree 626b036ae767241b7b58768a95afe0bd941538b0
parent ca10d2b1d0f93a31cf203efb026031456cc7148d
parent 6d305c254a96bcaa717d602fc33e1e6a8a74848e

Merge "Enforce to restart docker service on proxy change"

docker/files/http-proxy.conf

diff --git a/docker/files/http-proxy.conf b/docker/files/http-proxy.conf
index 13d494d..9ae5c00 100644
--- a/docker/files/http-proxy.conf
+++ b/docker/files/http-proxy.conf
@@ -1,5 +1,11 @@
 {%- from "docker/map.jinja" import host with context -%}
 [Service]
+{%- if host.proxy.get('http') %}
 Environment="HTTP_PROXY={{ host.proxy.http }}"
+{%- endif -%}
+{%- if host.proxy.get('https') %}
 Environment="HTTPS_PROXY={{ host.proxy.https }}"
+{%- endif -%}
+{%- if host.proxy.get('no_proxy') %}
 Environment="NO_PROXY={{ host.proxy.no_proxy|join(',') }}"
+{%- endif -%}