diff --git a/cloud/docker b/cloud/docker index a6af36c4f48..3fb82fd7dc5 100644 --- a/cloud/docker +++ b/cloud/docker @@ -301,6 +301,7 @@ import sys from urlparse import urlparse try: import docker.client + import docker.utils from requests.exceptions import * except ImportError, e: HAS_DOCKER_PY = False @@ -524,10 +525,8 @@ class DockerManager: 'command': self.module.params.get('command'), 'ports': self.exposed_ports, 'volumes': self.volumes, - 'volumes_from': self.module.params.get('volumes_from'), 'mem_limit': _human_to_bytes(self.module.params.get('memory_limit')), 'environment': self.env, - 'dns': self.module.params.get('dns'), 'hostname': self.module.params.get('hostname'), 'detach': self.module.params.get('detach'), 'name': self.module.params.get('name'), @@ -535,6 +534,10 @@ class DockerManager: 'tty': self.module.params.get('tty'), } + if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) < 0: + params['dns'] = self.module.params.get('dns') + params['volumes_from'] = self.module.params.get('volumes_from') + def do_create(count, params): results = [] for _ in range(count): @@ -562,6 +565,11 @@ class DockerManager: 'privileged': self.module.params.get('privileged'), 'links': self.links, } + + if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0: + params['dns'] = self.module.params.get('dns') + params['volumes_from'] = self.module.params.get('volumes_from') + for i in containers: self.client.start(i['Id'], **params) self.increment_counter('started')