From 706195fb0240442130a342da66c7d20b882445eb Mon Sep 17 00:00:00 2001 From: Kirill Petrov Date: Tue, 30 Jun 2020 06:40:43 +0300 Subject: [PATCH] use Config MacAddress by default instead of Networks (#564) * use Config MacAddress by default instead of Networks * use Config MacAddress by default instead of Networks - fix typo * #564 docker_container macaddress - add changelog fragment --- .../564-docker_container_use_config_macaddress_by_default.yaml | 2 ++ plugins/modules/cloud/docker/docker_container.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/564-docker_container_use_config_macaddress_by_default.yaml diff --git a/changelogs/fragments/564-docker_container_use_config_macaddress_by_default.yaml b/changelogs/fragments/564-docker_container_use_config_macaddress_by_default.yaml new file mode 100644 index 0000000000..b2eab62644 --- /dev/null +++ b/changelogs/fragments/564-docker_container_use_config_macaddress_by_default.yaml @@ -0,0 +1,2 @@ +bugfixes: + - docker_container - use Config MacAddress by default instead of Networks. Networks MacAddress is empty in some cases (https://github.com/ansible/ansible/issues/70206). diff --git a/plugins/modules/cloud/docker/docker_container.py b/plugins/modules/cloud/docker/docker_container.py index 7a69d2b100..87cdba3124 100644 --- a/plugins/modules/cloud/docker/docker_container.py +++ b/plugins/modules/cloud/docker/docker_container.py @@ -2121,7 +2121,7 @@ class Container(DockerBaseClass): ipc_mode=host_config.get("IpcMode"), labels=config.get('Labels'), expected_links=host_config.get('Links'), - mac_address=network.get('MacAddress'), + mac_address=config.get('MacAddress', network.get('MacAddress')), memory_swappiness=host_config.get('MemorySwappiness'), network_mode=host_config.get('NetworkMode'), userns_mode=host_config.get('UsernsMode'),