From f09bf0a75b0e2b858702a77eab266c7f8fdfb218 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 2 Nov 2018 17:52:35 +0100 Subject: [PATCH] [2.6] docker_container: fix memory_swappiness documentation (#47379) * Documentation for docker_container: fix documentation for memory_swappiness. Default value will not equal 0, it will be inherited from the host machine (#47296) (cherry picked from commit 4c2efa4b67b9c97df79ed9dd56470abfc8255114) * Add changelog. --- .../fragments/47296-docker_container-memory_swappiness.yaml | 2 ++ lib/ansible/modules/cloud/docker/docker_container.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/47296-docker_container-memory_swappiness.yaml diff --git a/changelogs/fragments/47296-docker_container-memory_swappiness.yaml b/changelogs/fragments/47296-docker_container-memory_swappiness.yaml new file mode 100644 index 0000000000..dc7c602a04 --- /dev/null +++ b/changelogs/fragments/47296-docker_container-memory_swappiness.yaml @@ -0,0 +1,2 @@ +bugfixes: +- "docker_container - fix ``memory_swappiness`` documentation." diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py index 722ec6453f..c26314e676 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -213,7 +213,7 @@ options: memory_swappiness: description: - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100. - default: 0 + - If not set, the value will be remain the same if container exists and will be inherited from the host machine if it is (re-)created. name: description: - Assign a name to a new container or match an existing container.