diff --git a/inventory/sample/group_vars/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster.yml index babdc732acb11e91c08a7a326fef600dcd7023f3..d03750215caa180ce115894babd1a69d935dbbfe 100644 --- a/inventory/sample/group_vars/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster.yml @@ -140,6 +140,9 @@ dns_domain: "{{ cluster_name }}" # Path used to store Docker data docker_daemon_graph: "/var/lib/docker" +## Used to set docker daemon iptables options to true +#docker_iptables_enabled: "true" + ## A string of extra options to pass to the docker daemon. ## This string should be exactly as you wish it to appear. ## An obvious use case is allowing insecure-registry access diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 1013523c97da5693642819a3885f20ffa09168a0..eac454ce4af5ea0b9f6f77c3e0b8a8817fc945c6 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -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" diff --git a/roles/docker/templates/docker-options.conf.j2 b/roles/docker/templates/docker-options.conf.j2 index f1587ec4d55588db15e7d05efd67de2943c7a31b..296f5a8a10eaf07524be5b429b926a06dcde6ea2 100644 --- a/roles/docker/templates/docker-options.conf.j2 +++ b/roles/docker/templates/docker-options.conf.j2 @@ -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 %}