diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-05-17 11:53:22 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-05-17 11:53:24 +0200 |
| commit | 9e9dc2260ee0175bbef2bb2714e5201d0d9683c2 (patch) | |
| tree | c89f6c6c1fd3c1e3e460dfa46ce9b5c305416ba5 /roles/docker | |
| parent | 0090be3aa291b7c02190928dea96ffbaa3faf1ce (diff) | |
| download | openshift-9e9dc2260ee0175bbef2bb2714e5201d0d9683c2.tar.gz openshift-9e9dc2260ee0175bbef2bb2714e5201d0d9683c2.tar.bz2 openshift-9e9dc2260ee0175bbef2bb2714e5201d0d9683c2.tar.xz openshift-9e9dc2260ee0175bbef2bb2714e5201d0d9683c2.zip | |
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>
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
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] |