From 7baaf97a8b1dbf1c8b3652d12c2d0b3bb3a6e245 Mon Sep 17 00:00:00 2001 From: Sergey Zhukov Date: Fri, 30 Jan 2015 19:58:12 +0300 Subject: [PATCH] Fixed broken volumes_from for client API >= 1.10 --- cloud/docker/docker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 1957c2d4db0..027d5c84bcc 100644 --- a/cloud/docker/docker.py +++ b/cloud/docker/docker.py @@ -731,6 +731,8 @@ class DockerManager(object): 'dns': self.module.params.get('dns'), '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: self.ensure_capability('dns')