From 95db943bd759846ba9753bfc8868abe17e96d2fb Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Wed, 10 May 2017 09:36:00 -0400 Subject: Ensure true is lowercase in daemon.json --- roles/docker/tasks/systemcontainer_docker.yml | 1 + roles/docker/templates/daemon.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'roles') diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 722232a9b..a461c479a 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -121,6 +121,7 @@ l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}" l_docker_additional_registries: "{{ docker_additional_registries | default([]) | to_json }}" l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}" + l_docker_selinux_enabled: "{{ docker_selinux_enabled | default(true) | to_json }}" # Configure container-engine using the daemon.json file - name: Configure Container Engine diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index 7ea8164b3..5eb4822e2 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, -- cgit v1.2.3 From dd8f16c8b58ffd5ce25190353575d5b6b4a3e743 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Wed, 10 May 2017 09:51:52 -0400 Subject: Rename blocked-registries to block-registries The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries. --- roles/docker/templates/daemon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles') diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index 5eb4822e2..82edf27c0 100644 --- a/roles/docker/templates/daemon.json +++ b/roles/docker/templates/daemon.json @@ -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" } -- cgit v1.2.3