cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make project start and stop error handling more resilient, and improve message text.

Browse source
This commit is contained in:
Chris Houseknecht 2016-09-20 09:45:26 -04:00 committed by Matt Clay
parent ecb05b03d4
commit b01af0d747
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker_service.py
View file

@ -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