External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-17 19:20:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2876 from neith00/docker_iptables

Browse Source 
parametrized iptables options for docker daemon
This commit is contained in:
Andreas Krüger
2018-06-14 22:23:27 +02:00
committed by GitHub
parent 3a569c9dcb f2f1e7f9d1
commit 6ac601fd2d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/docker/defaults/main.yml
View File

@@ -40,3 +40,6 @@ dockerproject_rh_repo_base_url: 'https://yum.dockerproject.org/repo/main/centos/
dockerproject_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg'
dockerproject_apt_repo_base_url: 'https://apt.dockerproject.org/repo'
dockerproject_apt_repo_gpgkey: 'https://apt.dockerproject.org/gpg'
# Used to set docker daemon iptables options
docker_iptables_enabled: "false"

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

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