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

Include bind mounts in VOLUMES check.

Browse source
This commit is contained in:
Ash Wilson 2015-03-09 11:20:14 -04:00 committed by Matt Clay
parent 959d135b60
commit 4e7d766e8f
1 changed files with 2 additions and 4 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

@ -820,13 +820,11 @@ class DockerManager(object):
continue continue
# VOLUMES # VOLUMES
# not including bind modes.
expected_volume_keys = set((image['ContainerConfig']['Volumes'] or {}).keys()) expected_volume_keys = set((image['ContainerConfig']['Volumes'] or {}).keys())
if self.volumes: if self.volumes:
for key, config in self.volumes.iteritems(): expected_volume_keys.update(self.volumes.keys())
if not config and key not in self.binds:
expected_volume_keys.add(key)
actual_volume_keys = set((container['Config']['Volumes'] or {}).keys()) actual_volume_keys = set((container['Config']['Volumes'] or {}).keys())
if actual_volume_keys != expected_volume_keys: if actual_volume_keys != expected_volume_keys: