cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename return var to avoid conflicts

Browse source 
fixes #22323
This commit is contained in:
Brian Coca 2017-03-06 12:11:54 -05:00 committed by Brian Coca
parent 43ba8813d3
commit 20bf02f6b9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -611,8 +611,9 @@ EXAMPLES = '''
''' '''
RETURN = ''' RETURN = '''
ansible_docker_container: docker_container:
description: 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. - 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. - Note that facts are not part of registered vars but accessible directly.
- Empty if C(state) is I(absent) - Empty if C(state) is I(absent)
@ -1675,7 +1676,7 @@ class ContainerManager(DockerBaseClass):
self.results['diff'] = self.diff self.results['diff'] = self.diff
if self.facts: if self.facts:
self.results['ansible_facts'] = {'ansible_docker_container': self.facts} self.results['ansible_facts'] = {'docker_container': self.facts}
def present(self, state): def present(self, state):
container = self._get_container(self.parameters.name) container = self._get_container(self.parameters.name)