Merge pull request #2258 from SamYaple/fix_docker_bug_2257

Don't assume ExposedPorts exists (bug #2257)
ansible · Oct 14, 2015 · 4c14e62 · 4c14e62
2 parents 84b1a1a + f15d285
commit 4c14e62
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
@@ -1062,11 +1062,11 @@ def get_differing_containers(self):
                     continue
 
             # EXPOSED PORTS
-            expected_exposed_ports = set((image['ContainerConfig']['ExposedPorts'] or {}).keys())
+            expected_exposed_ports = set((image['ContainerConfig'].get('ExposedPorts') or {}).keys())
             for p in (self.exposed_ports or []):
                 expected_exposed_ports.add("/".join(p))
 
-            actually_exposed_ports = set((container["Config"]["ExposedPorts"] or {}).keys())
+            actually_exposed_ports = set((container["Config"].get("ExposedPorts") or {}).keys())
 
             if actually_exposed_ports != expected_exposed_ports:
                 self.reload_reasons.append('exposed_ports ({0} => {1})'.format(actually_exposed_ports, expected_exposed_ports))