summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2017-03-06 12:11:54 -0500
committerBrian Coca <bcoca@users.noreply.github.com>2017-03-07 12:08:31 -0500
commit20bf02f6b96356ab5fe68578a3af9462b4ca42a5 (patch)
tree56779f13e66addfb4816d9deff691ab8eb14550b
parent43ba8813d399d6d4c150fafd0169ed28e68df3aa (diff)
downloadansible-20bf02f6b96356ab5fe68578a3af9462b4ca42a5.tar.gz
rename return var to avoid conflicts
fixes #22323
-rw-r--r--lib/ansible/modules/cloud/docker/docker_container.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py
index 7625deabb4..e22a847d48 100644
--- a/lib/ansible/modules/cloud/docker/docker_container.py
+++ b/lib/ansible/modules/cloud/docker/docker_container.py
@@ -611,8 +611,9 @@ EXAMPLES = '''
'''
RETURN = '''
-ansible_docker_container:
+docker_container:
description:
+ - Before 2.3 this was 'ansible_docker_container' but was renamed due to conflicts with the connection plugin.
- Facts representing the current state of the container. Matches the docker inspection output.
- Note that facts are not part of registered vars but accessible directly.
- Empty if C(state) is I(absent)
@@ -1675,7 +1676,7 @@ class ContainerManager(DockerBaseClass):
self.results['diff'] = self.diff
if self.facts:
- self.results['ansible_facts'] = {'ansible_docker_container': self.facts}
+ self.results['ansible_facts'] = {'docker_container': self.facts}
def present(self, state):
container = self._get_container(self.parameters.name)