summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh Wilson <smashwilson@gmail.com>2015-03-09 11:20:14 -0400
committerAsh Wilson <smashwilson@gmail.com>2015-03-09 11:20:14 -0400
commit608ddbea29ed7b5ba85efdf465e844b2a32494c4 (patch)
treeeee058cd0f1b1ac856b7bb822e1d3bc5d752a728
parent2c58eb38458816ff36080676176b8ccb4f1c1365 (diff)
downloadansible-modules-core-608ddbea29ed7b5ba85efdf465e844b2a32494c4.tar.gz
Include bind mounts in VOLUMES check.
-rw-r--r--cloud/docker/docker.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index b1d799f9..ff8391ae 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -816,13 +816,11 @@ class DockerManager(object):
continue
# VOLUMES
- # not including bind modes.
expected_volume_keys = set((image['ContainerConfig']['Volumes'] or {}).keys())
if self.volumes:
- for key, config in self.volumes.iteritems():
- if not config and key not in self.binds:
- expected_volume_keys.add(key)
+ expected_volume_keys.update(self.volumes.keys())
+
actual_volume_keys = set((container['Config']['Volumes'] or {}).keys())
if actual_volume_keys != expected_volume_keys: