From afd0e78f169b99551c4ba07a36e960ca52dddd51 Mon Sep 17 00:00:00 2001 From: Matt Bray Date: Wed, 16 Apr 2014 23:42:56 +0100 Subject: [PATCH] docker.client.APIError has moved to docker.errors.APIError see https://github.com/dotcloud/docker-py/commit/18d4db09ecc79cef49830fa2c28c5e99dd02be42 --- cloud/docker | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cloud/docker b/cloud/docker index 3fb82fd7dc5..a459a6897bb 100644 --- a/cloud/docker +++ b/cloud/docker @@ -306,6 +306,11 @@ try: except ImportError, e: 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): suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'] @@ -730,7 +735,7 @@ def main(): 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() module.exit_json(failed=True, changed=changed, msg="Docker API error: " + e.explanation)