summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-05-12 12:27:59 -0400
committerSteve Milner <smilner@redhat.com>2017-05-12 12:28:01 -0400
commit6bc3ccc0968e75106818a5134467e44815a03425 (patch)
treed23c42c275317d3d049d8ce4daef0a124be2e140 /roles
parentd1d60e24b54ca6ba0dc98e8b0b2ea4cfa8b92830 (diff)
downloadopenshift-6bc3ccc0968e75106818a5134467e44815a03425.tar.gz
openshift-6bc3ccc0968e75106818a5134467e44815a03425.tar.bz2
openshift-6bc3ccc0968e75106818a5134467e44815a03425.tar.xz
openshift-6bc3ccc0968e75106818a5134467e44815a03425.zip
Remove userland-proxy-path from daemon.json
This flag is currently being set within the system container via the init.sh
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/templates/daemon.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/docker/templates/daemon.json b/roles/docker/templates/daemon.json
index c607e6afe..a41b7cdbd 100644
--- 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 }}
}