openstack/kayobe
Code Issues Proposed changes

Fix docker MTU configuration when no MTU specified

Browse Source 
We'll omit the option and use Docker's default value.
This commit is contained in:
Mark Goddard 2017-07-26 17:51:15 +00:00
parent d638402838
commit 4751a96cc5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/docker.yml
View File

@ -3,4 +3,4 @@
hosts: docker hosts: docker
roles: roles:
- role: docker - role: docker
docker_daemon_mtu: "{{ external_net_name | net_mtu }}" docker_daemon_mtu: "{{ external_net_name | net_mtu | default }}"

2
ansible/roles/docker/templates/daemon.json.j2
View File

@ -1,6 +1,8 @@
{ {
"storage-driver": "devicemapper", "storage-driver": "devicemapper",
{% if docker_daemon_mtu %}
"mtu": {{ docker_daemon_mtu }}, "mtu": {{ docker_daemon_mtu }},
{% endif %}
"storage-opts": [ "storage-opts": [
"dm.thinpooldev=/dev/mapper/{{ docker_storage_volume_group | replace('-', '--') }}-{{ docker_storage_volume_thinpool | replace('-', '--') }}", "dm.thinpooldev=/dev/mapper/{{ docker_storage_volume_group | replace('-', '--') }}-{{ docker_storage_volume_thinpool | replace('-', '--') }}",
"dm.use_deferred_removal=true", "dm.use_deferred_removal=true",