Merge "Remove -H fd:// for docker.service in the baremetal role"

This commit is contained in:
Jenkins 2017-01-05 17:37:03 +00:00 committed by Gerrit Code Review
commit 2c12993edd

View File

@ -1,11 +1,4 @@
[Service]
MountFlags=shared
ExecStart=
ExecStart=/usr/bin/docker daemon \
{% if docker_registry %}
--insecure-registry {{ docker_registry }} \
{% endif %}
{% if docker_storage_driver %}
--storage-driver={{ docker_storage_driver }}
{% endif %}
-H fd://
ExecStart=/usr/bin/docker daemon{% if docker_registry %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}