kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2825 from dshuvar/dshuvar/docker-options.conf 

Changed /etc/systemd/system/docker.service.d/docker-options.conf file for successful parsing mount aguments
pull/2853/head
Brad Beam 2018-06-06 12:56:18 -05:00 committed by GitHub
parent fe010504aa 16f860bbc2
commit 1f02cc70f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/docker/templates/docker-options.conf.j2
View File

@ -1,6 +1,5 @@
[Service] [Service]
Environment="DOCKER_OPTS={{ docker_options | default('') }} \ Environment="DOCKER_OPTS={{ docker_options|default('') }} --iptables=false"
--iptables=false"
{% if docker_mount_flags is defined and docker_mount_flags != "" %} {% if docker_mount_flags is defined and docker_mount_flags != "" %}
MountFlags={{ docker_mount_flags }} MountFlags={{ docker_mount_flags }}
{% endif %} {% endif %}