diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-04 16:39:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 16:39:04 -0500 |
| commit | 5a7b6beed127607f75a6c1128152da89ce01eca7 (patch) | |
| tree | 122851390956763876b9028ff976cd225c9f5264 /roles/docker/templates/systemcontainercustom.conf.j2 | |
| parent | 411235245c903be9e12790444f2f4cfae5ca7ef0 (diff) | |
| parent | 5120f8e90c0178ac7f6d911159ceb278dd87b4c9 (diff) | |
| download | openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.gz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.bz2 openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.xz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.zip | |
Merge pull request #6297 from mgugino-upstream-stage/crt_role
Implement container runtime role
Diffstat (limited to 'roles/docker/templates/systemcontainercustom.conf.j2')
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2 deleted file mode 100644 index 86eebfba6..000000000 --- a/roles/docker/templates/systemcontainercustom.conf.j2 +++ /dev/null @@ -1,17 +0,0 @@ -# {{ ansible_managed }} - -[Service] -{% if "http_proxy" in openshift.common %} -Environment=HTTP_PROXY={{ docker_http_proxy }} -{% endif -%} -{% if "https_proxy" in openshift.common %} -Environment=HTTPS_PROXY={{ docker_http_proxy }} -{% endif -%} -{% if "no_proxy" in openshift.common %} -Environment=NO_PROXY={{ docker_no_proxy }} -{% endif %} -{%- if os_firewall_use_firewalld|default(false) %} -[Unit] -Wants=iptables.service -After=iptables.service -{%- endif %} |