From b01af0d7479e10dc7e4e21d76564e3e64b2b37a8 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 20 Sep 2016 09:45:26 -0400 Subject: [PATCH] Make project start and stop error handling more resilient, and improve message text. --- lib/ansible/modules/cloud/docker/docker_service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_service.py b/lib/ansible/modules/cloud/docker/docker_service.py index afb2e757b68..8158de7e517 100644 --- a/lib/ansible/modules/cloud/docker/docker_service.py +++ b/lib/ansible/modules/cloud/docker/docker_service.py @@ -655,7 +655,7 @@ class ContainerManager(DockerBaseClass): detached=detached, remove_orphans=self.remove_orphans) except Exception as exc: - self.client.fail("Error bring %s up - %s" % (self.project.name, str(exc))) + self.client.fail("Error starting project - %s" % str(exc)) if self.stopped: result.update(self.cmd_stop(service_names)) @@ -804,7 +804,7 @@ class ContainerManager(DockerBaseClass): try: self.project.down(image_type, self.remove_volumes, self.remove_orphans) except Exception as exc: - self.client.fail("Error bringing %s down - %s" % (self.project.name, str(exc))) + self.client.fail("Error stopping project - %s" % str(exc)) return result