diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-03 16:06:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 16:06:16 -0500 |
| commit | 01135c08c46c3674f93123833bc14ba4aa661fe0 (patch) | |
| tree | 6033f586a27e4b7778bd52540768203bdde7ab1d /roles/docker/templates/systemcontainercustom.conf.j2 | |
| parent | 850bb25200db1488f66c15d9a49cfb8dbc09946a (diff) | |
| parent | 44115530148069e200e3a5d92b00e981aaa6e824 (diff) | |
| download | openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.gz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.bz2 openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.xz openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.zip | |
Merge pull request #4049 from ashcrow/system-container-docker
Merged by openshift-bot
Diffstat (limited to 'roles/docker/templates/systemcontainercustom.conf.j2')
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2 new file mode 100644 index 000000000..a2cfed8a9 --- /dev/null +++ b/roles/docker/templates/systemcontainercustom.conf.j2 @@ -0,0 +1,17 @@ +# {{ ansible_managed }} + +[Service] +{%- if docker_http_proxy %} +ENVIRONMENT=HTTP_PROXY={{ docker_http_proxy }} +{%- endif -%} +{%- if docker_https_proxy %} +ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }} +{%- endif -%} +{%- if docker_no_proxy %} +ENVIRONMENT=NO_PROXY={{ docker_no_proxy }} +{%- endif %} +{%- if os_firewall_use_firewalld|default(true) %} +[Unit] +Wants=iptables.service +After=iptables.service +{%- endif %} |