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

make binds a list instead of a dict (to prevent overwriting when copying the same file to two places) (#2294)

Browse source
This commit is contained in:
Fabian von Feilitzsch 2016-04-12 16:01:45 -04:00 committed by Matt Clay
parent 165f48717a
commit 32c744e82a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker.py
View file

@ -699,7 +699,7 @@ class DockerManager(object):
self.binds = None
self.volumes = None
if self.module.params.get('volumes'):
self.binds = {}
self.binds = []
self.volumes = []
vols = self.module.params.get('volumes')
for vol in vols:
@ -717,7 +717,7 @@ class DockerManager(object):
self.module.fail_json(msg='invalid bind mode ' + parts[2])
else:
mode = parts[2]
self.binds[parts[0]] = {'bind': parts[1], 'mode': mode }
self.binds.append((parts[0], {'bind': parts[1], 'mode': mode}))
else:
self.module.fail_json(msg='volumes support 1 to 3 arguments')
@ -1370,7 +1370,7 @@ class DockerManager(object):
expected_binds = set()
if self.binds:
for host_path, config in self.binds.iteritems():
for host_path, config in self.binds:
if isinstance(config, dict):
container_path = config['bind']
mode = config['mode']