From 3d5f84c528175f2e3a6dfe359fd68fe6ccdbee34 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 21 Jun 2016 02:49:22 -0400 Subject: [PATCH] Fix compose_version error. Check has compose before checking version. --- lib/ansible/modules/cloud/docker/docker_service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_service.py b/lib/ansible/modules/cloud/docker/docker_service.py index 527e0fbf204..476d38d60bb 100644 --- a/lib/ansible/modules/cloud/docker/docker_service.py +++ b/lib/ansible/modules/cloud/docker/docker_service.py @@ -484,14 +484,14 @@ class ContainerManager(DockerBaseClass): if self.files: self.options[u'--file'] = self.files + if not HAS_COMPOSE: + self.client.fail("Unable to load docker-compose. Try `pip install docker-compose`. Error: %s" % HAS_COMPOSE_EXC) + if LooseVersion(compose_version) < LooseVersion(MINIMUM_COMPOSE_VERSION): self.client.fail("Found docker-compose version %s. Minimum required version is %s. " "Upgrade docker-compose to a min version of %s." % (compose_version, MINIMUM_COMPOSE_VERSION, MINIMUM_COMPOSE_VERSION)) - if not HAS_COMPOSE: - self.client.fail("Unable to load docker-compose. Try `pip install docker-compose`. Error: %s" % HAS_COMPOSE_EXC) - self.log("options: ") self.log(self.options, pretty_print=True)