Commit 3948dc2d by Matt Bray

docker.client.APIError has moved to docker.errors.APIError

see https://github.com/dotcloud/docker-py/commit/18d4db09ecc79cef49830fa2c28c5e99dd02be42
parent a37a8424
...@@ -306,6 +306,11 @@ try: ...@@ -306,6 +306,11 @@ try:
except ImportError, e: except ImportError, e:
HAS_DOCKER_PY = False HAS_DOCKER_PY = False
try:
from docker.errors import APIError as DockerAPIError
except ImportError:
from docker.client import APIError as DockerAPIError
def _human_to_bytes(number): def _human_to_bytes(number):
suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'] suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
...@@ -730,7 +735,7 @@ def main(): ...@@ -730,7 +735,7 @@ def main():
module.exit_json(failed=failed, changed=changed, msg=msg, ansible_facts=_ansible_facts(facts)) module.exit_json(failed=failed, changed=changed, msg=msg, ansible_facts=_ansible_facts(facts))
except docker.client.APIError, e: except DockerAPIError, e:
changed = manager.has_changed() changed = manager.has_changed()
module.exit_json(failed=True, changed=changed, msg="Docker API error: " + e.explanation) module.exit_json(failed=True, changed=changed, msg="Docker API error: " + e.explanation)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment