Fix docker

This commit is contained in:
ant31
2015-11-20 14:04:13 +01:00
parent f368faf66b
commit 323155b0e1
5 changed files with 19 additions and 8 deletions

View File

@@ -13,7 +13,7 @@
with_items:
- aufs-tools
- cgroupfs-mount
- docker-engine=1.8.3-0~{{ ansible_distribution_release }}
- docker-engine=1.9.0-0~{{ ansible_distribution_release }}
- name: Copy default docker configuration
template: src=default-docker.j2 dest=/etc/default/docker backup=yes

View File

@@ -4,9 +4,9 @@
#DOCKER="/usr/local/bin/docker"
# Use DOCKER_OPTS to modify the daemon startup options.
#{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
#DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"
#{% endif %}
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"
{% endif %}
# If you need Docker to use an HTTP proxy, it can also be specified here.
#export http_proxy="http://127.0.0.1:3128/"