diff options
| author | Gan Huang <ghuang@redhat.com> | 2017-05-05 18:18:41 +0800 |
|---|---|---|
| committer | Gan Huang <ghuang@redhat.com> | 2017-05-05 22:39:54 +0800 |
| commit | e360372dcaf78648a329ce16f9d0365eed6636c8 (patch) | |
| tree | 1573e487e707dbaeb4ddeca031376dfb81a3d310 /roles/docker/templates/systemcontainercustom.conf.j2 | |
| parent | f7993afb2fec58b7bd13a70d812bf60deb5b1402 (diff) | |
| download | openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.gz openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.bz2 openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.xz openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.zip | |
Fix 1448368, and some other minors issues
Diffstat (limited to 'roles/docker/templates/systemcontainercustom.conf.j2')
| -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 a2cfed8a9..a4fb01d2b 100644 --- a/roles/docker/templates/systemcontainercustom.conf.j2 +++ b/roles/docker/templates/systemcontainercustom.conf.j2 @@ -1,13 +1,13 @@ # {{ ansible_managed }} [Service] -{%- if docker_http_proxy %} +{%- if "http_proxy" in openshift.common %} ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }} {%- endif -%} -{%- if docker_https_proxy %} +{%- if "https_proxy" in openshift.common %} ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }} {%- endif -%} -{%- if docker_no_proxy %} +{%- if "no_proxy" in openshift.common %} ENVIRONMENT=NO_PROXY={{ docker_no_proxy }} {%- endif %} {%- if os_firewall_use_firewalld|default(true) %} |