Fixed broken volumes_from for client API >= 1.10

reviewable/pr18780/r1
Sergey Zhukov 10 years ago
parent be744ce5e7
commit 7baaf97a8b

@ -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')

Loading…
Cancel
Save