summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-10 23:02:38 -0500
committerGitHub <noreply@github.com>2017-05-10 23:02:38 -0500
commit0c08ff121fbd32cb71ee241b4e33df84bd3d7506 (patch)
tree7e9e0174f2b8a43e1a7e77f322252add3a22867e /roles/docker/templates
parentedfb4329eca819a6d9d1f09b66d81a91412fde60 (diff)
parentcc18aa0edf3a55954c2227c01eee25d12766702a (diff)
downloadopenshift-0c08ff121fbd32cb71ee241b4e33df84bd3d7506.tar.gz
openshift-0c08ff121fbd32cb71ee241b4e33df84bd3d7506.tar.bz2
openshift-0c08ff121fbd32cb71ee241b4e33df84bd3d7506.tar.xz
openshift-0c08ff121fbd32cb71ee241b4e33df84bd3d7506.zip
Merge pull request #4152 from sdodson/iptables-default
Merged by openshift-bot
Diffstat (limited to 'roles/docker/templates')
-rw-r--r--roles/docker/templates/systemcontainercustom.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/templates/systemcontainercustom.conf.j2 b/roles/docker/templates/systemcontainercustom.conf.j2
index a4fb01d2b..1faad506a 100644
--- a/roles/docker/templates/systemcontainercustom.conf.j2
+++ b/roles/docker/templates/systemcontainercustom.conf.j2
@@ -10,7 +10,7 @@ ENVIRONMENT=HTTPS_PROXY={{ docker_http_proxy }}
{%- if "no_proxy" in openshift.common %}
ENVIRONMENT=NO_PROXY={{ docker_no_proxy }}
{%- endif %}
-{%- if os_firewall_use_firewalld|default(true) %}
+{%- if os_firewall_use_firewalld|default(false) %}
[Unit]
Wants=iptables.service
After=iptables.service