C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1059 from holser/docker_iptables

Browse source 
iptables switch for docker
This commit is contained in:
Matthew Mosesohn 2017-02-22 08:23:58 +03:00 committed by GitHub
commit 02137f8cee
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/all.yml
View file

@ -195,7 +195,7 @@ docker_daemon_graph: "/var/lib/docker"
## This string should be exactly as you wish it to appear. ## This string should be exactly as you wish it to appear.
## An obvious use case is allowing insecure-registry access ## An obvious use case is allowing insecure-registry access
## to self hosted registries like so: ## to self hosted registries like so:
docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }}" docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} --iptables=false"
docker_bin_dir: "/usr/bin" docker_bin_dir: "/usr/bin"
## Uncomment this if you want to force overlay/overlay2 as docker storage driver ## Uncomment this if you want to force overlay/overlay2 as docker storage driver

2
roles/docker/defaults/main.yml
View file

@ -1,4 +1,4 @@
docker_version: '1.12' docker_version: '1.13'
docker_package_info: docker_package_info:
pkgs: pkgs:

3
roles/docker/vars/ubuntu.yml
View file

@ -1,5 +1,4 @@
--- ---
docker_version: '1.12'
docker_kernel_min_version: '3.10' docker_kernel_min_version: '3.10'
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist # https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
@ -7,7 +6,7 @@ docker_versioned_pkg:
'latest': docker-engine 'latest': docker-engine
'1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }}
'1.12': docker-engine=1.12.6-0~ubuntu-{{ ansible_distribution_release|lower }} '1.12': docker-engine=1.12.6-0~ubuntu-{{ ansible_distribution_release|lower }}
'1.13': docker-engine=1.13.0-0~ubuntu-{{ ansible_distribution_release|lower }} '1.13': docker-engine=1.13.1-0~ubuntu-{{ ansible_distribution_release|lower }}
docker_package_info: docker_package_info:
pkg_mgr: apt pkg_mgr: apt