summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-10 20:58:50 -0400
committerGitHub <noreply@github.com>2017-05-10 20:58:50 -0400
commitf724a2cbd99ab131436089b3ec58af8498f5fbfb (patch)
tree8f9c0bb0b5871c6d3752a0f06996eee02315bf56
parentbf68d82e78da04d6042637fcabd82c6864bbdd96 (diff)
parentdd8f16c8b58ffd5ce25190353575d5b6b4a3e743 (diff)
downloadopenshift-f724a2cbd99ab131436089b3ec58af8498f5fbfb.tar.gz
openshift-f724a2cbd99ab131436089b3ec58af8498f5fbfb.tar.bz2
openshift-f724a2cbd99ab131436089b3ec58af8498f5fbfb.tar.xz
openshift-f724a2cbd99ab131436089b3ec58af8498f5fbfb.zip
Merge pull request #4147 from ashcrow/lowercase-true
Ensure true is lowercase in daemon.json
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml1
-rw-r--r--roles/docker/templates/daemon.json4
2 files changed, 3 insertions, 2 deletions
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..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"
}