cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from

Browse source 
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
This commit is contained in:
Toshio Kuratomi 2015-03-13 13:42:40 -07:00
commit 45637176dc
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cloud/docker/docker.py
View file

@ -1188,13 +1188,7 @@ class DockerManager(object):
'name': self.module.params.get('name'),
'stdin_open': self.module.params.get('stdin_open'),
'tty': self.module.params.get('tty'),
'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['volumes_from'] is not None:
self.ensure_capability('volumes_from')
def do_create(count, params):
results = []