From 69568b4ca8281c07a261bbcde1c9479c45aa35b9 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 22 Oct 2018 19:40:27 +0200 Subject: [PATCH] [2.7] docker_container: fix memory_swappiness documentation (#47378) * 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 00000000000..dc7c602a047 --- /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 8c31fceb1f3..b42e8114cac 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -218,7 +218,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.