wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker.swarm library docker bug workaround to provide correct swarm leader address (#53930)

Browse source 
* Workaround for moby/moby#35437 bug for ansible.docker.swarm library to provide correct leader node IP address

* Adding simple parser to separate IP address from port number for workaround

* Adding simple parser to separate IP address from port number for workaround (inline)

* Different split() method
This commit is contained in:
Piotr Wojciechowski 2019-03-19 13:50:32 +01:00 committed by ansibot
parent e2371d4b52
commit 2c473259cb
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/docker/swarm.py
View file

@ -4,6 +4,7 @@
import json
from time import sleep
from re import split
try:
from docker.errors import APIError
@ -166,6 +167,17 @@ class AnsibleDockerSwarmClient(AnsibleDockerClient):
json_str = json.dumps(node_info, ensure_ascii=False)
node_info = json.loads(json_str)
if 'ManagerStatus' in node_info:
if node_info['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
count_colons = node_info['ManagerStatus']['Addr'].count(":")
if count_colons == 1:
swarm_leader_ip = node_info['ManagerStatus']['Addr'].split(":", 1)[0] or node_info['Status']['Addr']
else:
swarm_leader_ip = node_info['Status']['Addr']
node_info['Status']['Addr'] = swarm_leader_ip
return node_info
def get_all_nodes_inspect(self):