diff options
| author | Sergey Zhukov <sergey@jetbrains.com> | 2015-01-30 19:58:12 +0300 |
|---|---|---|
| committer | Sergey Zhukov <sergey@jetbrains.com> | 2015-01-30 19:58:12 +0300 |
| commit | 7baaf97a8b1dbf1c8b3652d12c2d0b3bb3a6e245 (patch) | |
| tree | 95e9708ddc38d0875c0c654089d68cf6a3d4fd15 | |
| parent | be744ce5e78f217eb34c4d369847f1e174da9ae6 (diff) | |
| download | ansible-modules-core-7baaf97a8b1dbf1c8b3652d12c2d0b3bb3a6e245.tar.gz | |
Fixed broken volumes_from for client API >= 1.10
| -rw-r--r-- | cloud/docker/docker.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py index 1957c2d4..027d5c84 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') |