Merge pull request #293 from mattymo/calicodockeropts

Add docker_options to calico networking
2016-06-14 19:13:43 +02:00
parent 587c8f4701 153b82a803
commit c2093b128d
1 changed files with 1 additions and 1 deletions
--- a/roles/network_plugin/calico/templates/docker
+++ b/roles/network_plugin/calico/templates/docker
@ -1,2 +1,2 @@
 # Deployed by Ansible
-DOCKER_OPTS=""
+DOCKER_OPTS="{% if docker_options is defined %}{{ docker_options }}{% endif %}"
`@ -1,2 +1,2 @@`
	`# Deployed by Ansible`	`# Deployed by Ansible`
	`DOCKER_OPTS=""`	`DOCKER_OPTS="{% if docker_options is defined %}{{ docker_options }}{% endif %}"`