diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-01 10:41:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-01 10:41:02 +0000 |
| commit | 728b62cd50ff01514b2ce975fec56366f161d87d (patch) | |
| tree | 9ce31eaaddc73a7b7e046c9a52fdbe2ae0b735b7 | |
| parent | b3c205dd40ef0bd25191421641f13b4407154802 (diff) | |
| parent | 4649279c9d14b70a0155b13eb6982a82c0fc5877 (diff) | |
| download | kolla-728b62cd50ff01514b2ce975fec56366f161d87d.tar.gz kolla-728b62cd50ff01514b2ce975fec56366f161d87d.zip | |
Merge "Rework log output if pull fails"
| -rw-r--r-- | ansible/library/kolla_docker.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 5cab7b47e..705fc939b 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -358,23 +358,35 @@ class DockerWorker(object): ] for status in reversed(statuses): - # NOTE(jeffrey4l): Get the last not empty status with status - # property + if 'error' in status: + if status['error'].endswith('not found'): + self.module.fail_json( + msg="The requested image does not exist: {}:{}".format( + image, tag), + failed=True + ) + else: + self.module.fail_json( + msg="Unknown error message: {}".format( + status['error']), + failed=True + ) + if status and status.get('status'): # NOTE(SamYaple): This allows us to use v1 and v2 docker # registries. Eventually docker will stop supporting v1 # registries and when that happens we can remove this. - if 'legacy registry' in status.get('status'): + if 'legacy registry' in status['status']: continue - elif "Downloaded newer image for" in status.get('status'): + elif 'Downloaded newer image for' in status['status']: self.changed = True return - elif "Image is up to date for" in status.get('status'): + elif 'Image is up to date for' in status['status']: return else: self.module.fail_json( - msg="Invalid status returned from pull", - changed=True, + msg="Unknown status message: {}".format( + status['status']), failed=True ) |