diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-12 19:16:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 19:16:40 -0500 |
| commit | d2a435c32ebba0d8caa8b91009234ed66ac57c05 (patch) | |
| tree | ded83fccdedbac5b18487fe2eddc988a6330ffff /roles/docker/templates | |
| parent | 56cc912451a9da3cb603db85edb01fb2d8d92ac8 (diff) | |
| parent | a3d7c072a8a8911d11ec42a313f78a8673a64ad8 (diff) | |
| download | openshift-d2a435c32ebba0d8caa8b91009234ed66ac57c05.tar.gz openshift-d2a435c32ebba0d8caa8b91009234ed66ac57c05.tar.bz2 openshift-d2a435c32ebba0d8caa8b91009234ed66ac57c05.tar.xz openshift-d2a435c32ebba0d8caa8b91009234ed66ac57c05.zip | |
Merge pull request #4172 from ashcrow/1450307
Merged by openshift-bot
Diffstat (limited to 'roles/docker/templates')
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2 index 1faad506a..b727c57d4 100644 --- a/roles/docker/templates/systemcontainercustom.conf.j2 +++ b/roles/docker/templates/systemcontainercustom.conf.j2 @@ -1,15 +1,15 @@ # {{ ansible_managed }} [Service] -{%- if "http_proxy" in openshift.common %} +{% if "http_proxy" in openshift.common %} ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }} -{%- endif -%} -{%- if "https_proxy" in openshift.common %} +{% endif -%} +{% if "https_proxy" in openshift.common %} ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }} -{%- endif -%} -{%- if "no_proxy" in openshift.common %} +{% endif -%} +{% if "no_proxy" in openshift.common %} ENVIRONMENT=NO_PROXY={{ docker_no_proxy }} -{%- endif %} +{% endif %} {%- if os_firewall_use_firewalld|default(false) %} [Unit] Wants=iptables.service |