From 4751a96cc5837d51bb23264daf4e18ae5b8856d4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 26 Jul 2017 17:51:15 +0000 Subject: [PATCH] Fix docker MTU configuration when no MTU specified We'll omit the option and use Docker's default value. --- ansible/docker.yml | 2 +- ansible/roles/docker/templates/daemon.json.j2 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/docker.yml b/ansible/docker.yml index 1a55725f9..567c788f7 100644 --- a/ansible/docker.yml +++ b/ansible/docker.yml @@ -3,4 +3,4 @@ hosts: docker roles: - role: docker - docker_daemon_mtu: "{{ external_net_name | net_mtu }}" + docker_daemon_mtu: "{{ external_net_name | net_mtu | default }}" diff --git a/ansible/roles/docker/templates/daemon.json.j2 b/ansible/roles/docker/templates/daemon.json.j2 index 4f229af35..e817e5d68 100644 --- a/ansible/roles/docker/templates/daemon.json.j2 +++ b/ansible/roles/docker/templates/daemon.json.j2 @@ -1,6 +1,8 @@ { "storage-driver": "devicemapper", +{% if docker_daemon_mtu %} "mtu": {{ docker_daemon_mtu }}, +{% endif %} "storage-opts": [ "dm.thinpooldev=/dev/mapper/{{ docker_storage_volume_group | replace('-', '--') }}-{{ docker_storage_volume_thinpool | replace('-', '--') }}", "dm.use_deferred_removal=true",