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

docker_swarm inventory plugin - Leader address Docker bug workaround (#53893)

Browse source 
* * Workaround for Docker bug moby/moby#35437 when in some cases the Leader IP address is 0.0.0.0 instead of correct address
* Changes in docs port 2375 to 2376 to avoid confusion wherever the TLS is mentioned as this is default port for TLS connections in docker
* Imports optimization

* Adjust documentation section to match ansibot parsing

* Add comment why the workaround is required
This commit is contained in:
Piotr Wojciechowski 2019-03-16 17:55:52 +01:00 committed by ansibot
parent e62fc508ad
commit c89b799939
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/inventory/docker_swarm.py
View file

@ -11,7 +11,7 @@ DOCUMENTATION = '''
name: docker_swarm
plugin_type: inventory
version_added: '2.8'
authors:
author:
- Stefan Heitmüller (@morph027) <stefan.heitmueller@gmx.com>
short_description: Ansible dynamic inventory plugin for Docker swarm nodes.
requirements:
@ -69,12 +69,12 @@ host: tcp://my-docker-host:2375
# Example using remote docker with unverified TLS
plugin: docker_swarm
host: tcp://my-docker-host:2375
host: tcp://my-docker-host:2376
tls: yes
# Example using remote docker with verified TLS and client certificate verification
plugin: docker_swarm
host: tcp://my-docker-host:2375
host: tcp://my-docker-host:2376
tls_verify: yes
cacert_path: /somewhere/ca.pem
key_path: /somewhere/key.pem
@ -98,10 +98,10 @@ keyed_groups:
prefix: label
'''
from ansible.errors import AnsibleError, AnsibleParserError
from ansible.errors import AnsibleError
from ansible.module_utils._text import to_native
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
from ansible.release import __version__
from ansible.parsing.utils.addresses import parse_address
try:
import docker
@ -181,6 +181,10 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
self.inventory.set_variable(self.node_attrs['ID'], 'docker_swarm_node_attributes', self.node_attrs)
if 'ManagerStatus' in self.node_attrs:
if self.node_attrs['ManagerStatus'].get('Leader'):
# This is workaround of bug in Docker when in some cases the Leader IP is 0.0.0.0
# Check moby/moby#35437 for details
self.inventory.set_variable(self.node_attrs['ID'], 'ansible_host',
parse_address(self.node_attrs['ManagerStatus']['Addr'])[0])
self.inventory.add_host(self.node_attrs['ID'], group='leader')
# Use constructed if applicable
strict = self.get_option('strict')