diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-17 20:44:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 20:44:55 -0500 |
| commit | 6009c370aea32818ea49e22d054fab2c350aea07 (patch) | |
| tree | 9248cf9ac6c748119883108f1365fbb7b88cfdd9 /roles/docker | |
| parent | fb1ddd1e19340783ea849f7ab7fe35bca9e74c99 (diff) | |
| parent | 9e9dc2260ee0175bbef2bb2714e5201d0d9683c2 (diff) | |
| download | openshift-6009c370aea32818ea49e22d054fab2c350aea07.tar.gz openshift-6009c370aea32818ea49e22d054fab2c350aea07.tar.bz2 openshift-6009c370aea32818ea49e22d054fab2c350aea07.tar.xz openshift-6009c370aea32818ea49e22d054fab2c350aea07.zip | |
Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-Environment
Merged by openshift-bot
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] |