Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
02137f8c
Commit
02137f8c
authored
8 years ago
by
Matthew Mosesohn
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1059 from holser/docker_iptables
iptables switch for docker
parents
43ea281a
3bd46f7a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
inventory/group_vars/all.yml
+1
-1
1 addition, 1 deletion
inventory/group_vars/all.yml
roles/docker/defaults/main.yml
+1
-1
1 addition, 1 deletion
roles/docker/defaults/main.yml
roles/docker/vars/ubuntu.yml
+1
-2
1 addition, 2 deletions
roles/docker/vars/ubuntu.yml
with
3 additions
and
4 deletions
inventory/group_vars/all.yml
+
1
−
1
View file @
02137f8c
...
...
@@ -195,7 +195,7 @@ docker_daemon_graph: "/var/lib/docker"
## This string should be exactly as you wish it to appear.
## An obvious use case is allowing insecure-registry access
## 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"
## Uncomment this if you want to force overlay/overlay2 as docker storage driver
...
...
This diff is collapsed.
Click to expand it.
roles/docker/defaults/main.yml
+
1
−
1
View file @
02137f8c
docker_version
:
'
1.1
2
'
docker_version
:
'
1.1
3
'
docker_package_info
:
pkgs
:
...
...
This diff is collapsed.
Click to expand it.
roles/docker/vars/ubuntu.yml
+
1
−
2
View file @
02137f8c
---
docker_version
:
'
1.12'
docker_kernel_min_version
:
'
3.10'
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
...
...
@@ -7,7 +6,7 @@ docker_versioned_pkg:
'
latest'
:
docker-engine
'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.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
:
pkg_mgr
:
apt
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment