diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-11 11:00:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 11:00:39 -0400 |
| commit | 69ec61ccd272689360c6798c15a1204a92dd44b6 (patch) | |
| tree | a8bc51fa5bd3fc5c81bcfc2034b9df124774ebe4 | |
| parent | 74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f (diff) | |
| parent | ff11a556c7f9f84b877a304e494d218f8638a0dc (diff) | |
| download | openshift-69ec61ccd272689360c6798c15a1204a92dd44b6.tar.gz openshift-69ec61ccd272689360c6798c15a1204a92dd44b6.tar.bz2 openshift-69ec61ccd272689360c6798c15a1204a92dd44b6.tar.xz openshift-69ec61ccd272689360c6798c15a1204a92dd44b6.zip | |
Merge pull request #4158 from ganhuang/lower_bool
lower case in /etc/daemon.json and correct block-registry
| -rw-r--r-- | roles/docker/templates/daemon.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json index 82edf27c0..bebdd3cb2 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": {{ l_docker_selinux_enabled }}, + "selinux-enabled": {{ l_docker_selinux_enabled | lower }}, "storage-driver": "", "storage-opts": [], "tls": true, @@ -61,6 +61,6 @@ "tlsverify": true, "userns-remap": "", "add-registry": {{ l_docker_additional_registries }}, - "block-registries": {{ l_docker_blocked_registries }}, + "block-registry": {{ l_docker_blocked_registries }}, "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current" } |