Merge pull request openshift#4174 from ashcrow/remove-userland-proxy

Merged by openshift-bot
alex-berger · May 13, 2017 · 7eae685 · 7eae685
2 parents d2a435c + 6bc3ccc
commit 7eae685
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json
@@ -16,6 +16,5 @@
     },
     "selinux-enabled": {{ l_docker_selinux_enabled | lower }},
     "add-registry": {{ l_docker_additional_registries }},
-    "block-registry": {{ l_docker_blocked_registries }},
-    "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"
+    "block-registry": {{ l_docker_blocked_registries }}
 }