diff options
author | Chris Houseknecht <chouseknecht@ansible.com> | 2016-09-20 12:02:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-20 12:02:31 -0400 |
commit | 16c9597ca7b6594568978a91f71aa86e8ec07ecf (patch) | |
tree | 5f83da00ea23f9fb7b17d2542aadaf80ebfcd43b | |
parent | b87bf7c12d8117a5dcb53d7b5312f9ed20eb1901 (diff) | |
parent | 4a560d4a155fe4de590daae250b746e1b801cb67 (diff) | |
download | ansible-modules-core-16c9597ca7b6594568978a91f71aa86e8ec07ecf.tar.gz |
Merge pull request #4943 from chouseknecht/devel
Improve error handling in docker_service module
-rw-r--r-- | cloud/docker/docker_service.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloud/docker/docker_service.py b/cloud/docker/docker_service.py index afb2e757..db4352c9 100644 --- a/cloud/docker/docker_service.py +++ b/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 @@ -877,7 +877,7 @@ class ContainerManager(DockerBaseClass): result['actions'][service.name]['scale'] = self.scale[service.name] - len(containers) if not self.check_mode: try: - service.scale(self.scale[service.name]) + service.scale(int(self.scale[service.name])) except Exception as exc: self.client.fail("Error scaling %s - %s" % (service.name, str(exc))) return result |