diff options
Diffstat (limited to 'roles/docker/templates')
| -rw-r--r-- | roles/docker/templates/daemon.json | 4 | ||||
| -rw-r--r-- | roles/docker/templates/systemcontainercustom.conf.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index 7ea8164b3..82edf27c0 100644 --- a/roles/docker/templates/daemon.json +++ b/roles/docker/templates/daemon.json @@ -51,7 +51,7 @@ "path": "/usr/libexec/docker/docker-runc-current" } }, - "selinux-enabled": {{ docker_selinux_enabled|default(true) }}, + "selinux-enabled": {{ l_docker_selinux_enabled }}, "storage-driver": "", "storage-opts": [], "tls": true, @@ -61,6 +61,6 @@ "tlsverify": true, "userns-remap": "", "add-registry": {{ l_docker_additional_registries }}, - "blocked-registries": {{ l_docker_blocked_registries }}, + "block-registries": {{ l_docker_blocked_registries }}, "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current" } 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 |