diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-10 15:10:32 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-05-10 15:10:32 -0400 |
| commit | cc18aa0edf3a55954c2227c01eee25d12766702a (patch) | |
| tree | cba62c28f1adde14072599bf4023ee6db3c99818 /roles/docker/templates | |
| parent | 5a4365e765e16a4401d10f0bd42a7d3e194d4ab0 (diff) | |
| download | openshift-cc18aa0edf3a55954c2227c01eee25d12766702a.tar.gz openshift-cc18aa0edf3a55954c2227c01eee25d12766702a.tar.bz2 openshift-cc18aa0edf3a55954c2227c01eee25d12766702a.tar.xz openshift-cc18aa0edf3a55954c2227c01eee25d12766702a.zip | |
Default to iptables on master
We did this in 3.5 but never on master and we never came back to add
migration support. So we'll revert this on master and if/when we add
migration support we'll switch the default.
Diffstat (limited to 'roles/docker/templates')
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 2 |
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 |