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

Fixed broken volumes_from for client API >= 1.10

Browse source
This commit is contained in:
Sergey Zhukov 2015-01-30 19:58:12 +03:00
parent be744ce5e7
commit 7baaf97a8b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/docker/docker.py
View file

@ -731,6 +731,8 @@ class DockerManager(object):
'dns': self.module.params.get('dns'), 'dns': self.module.params.get('dns'),
'volumes_from': self.module.params.get('volumes_from'), 'volumes_from': self.module.params.get('volumes_from'),
} }
if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0:
params['volumes_from'] = ""
if params['dns'] is not None: if params['dns'] is not None:
self.ensure_capability('dns') self.ensure_capability('dns')