summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fontein <felix@fontein.de>2018-09-26 00:31:32 +0200
committerMatt Clay <matt@mystile.com>2018-09-25 15:31:32 -0700
commitfe2c9cdf13b5e532217d558ac16fbb9a945529c2 (patch)
treefc88b6c69578362f2be4abccbfcd3a212541afec
parentc12f41907a6b0d08d00479d97b2f23fd4f04056d (diff)
downloadansible-fe2c9cdf13b5e532217d558ac16fbb9a945529c2.tar.gz
[2.6] docker_container: don't parse/interpret options if state is 'absent' (#45768)
* Don't parse/interpret options if state is 'absent'. (#45700) * Added changelog.
-rw-r--r--changelogs/fragments/45700-docker_container-dont-parse-absent.yml2
-rw-r--r--lib/ansible/modules/cloud/docker/docker_container.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/fragments/45700-docker_container-dont-parse-absent.yml b/changelogs/fragments/45700-docker_container-dont-parse-absent.yml
new file mode 100644
index 0000000000..77a0af6c73
--- /dev/null
+++ b/changelogs/fragments/45700-docker_container-dont-parse-absent.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- "Don't parse parameters and options when ``state`` is ``absent`` (https://github.com/ansible/ansible/pull/45700)."
diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py
index df9f398118..d24a8faf73 100644
--- a/lib/ansible/modules/cloud/docker/docker_container.py
+++ b/lib/ansible/modules/cloud/docker/docker_container.py
@@ -730,6 +730,11 @@ class TaskParameters(DockerBaseClass):
for key, value in client.module.params.items():
setattr(self, key, value)
+ # If state is 'absent', parameters do not have to be parsed or interpreted.
+ # Only the container's name is needed.
+ if self.state == 'absent':
+ return
+
for param_name in REQUIRES_CONVERSION_TO_BYTES:
if client.module.params.get(param_name):
try: