Merge pull request #679 from marqc/fix_dns_create_container_issue
Fixes docker.errors.DockerException: 'dns' parameter has no effect on create_container()...
This commit is contained in:
commit
b787792908
1 changed files with 0 additions and 4 deletions
|
@ -735,15 +735,11 @@ class DockerManager(object):
|
||||||
'name': self.module.params.get('name'),
|
'name': self.module.params.get('name'),
|
||||||
'stdin_open': self.module.params.get('stdin_open'),
|
'stdin_open': self.module.params.get('stdin_open'),
|
||||||
'tty': self.module.params.get('tty'),
|
'tty': self.module.params.get('tty'),
|
||||||
'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:
|
if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0:
|
||||||
params['volumes_from'] = ""
|
params['volumes_from'] = ""
|
||||||
|
|
||||||
if params['dns'] is not None:
|
|
||||||
self.ensure_capability('dns')
|
|
||||||
|
|
||||||
if params['volumes_from'] is not None:
|
if params['volumes_from'] is not None:
|
||||||
self.ensure_capability('volumes_from')
|
self.ensure_capability('volumes_from')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue