diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-04 07:13:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-04 07:13:31 +0000 |
| commit | 083a21db4d6d1e3ffc3538be72769103dc4e5a95 (patch) | |
| tree | a5e8b519a6d4ee175e6f1c39ba9af94c27cd2254 /ansible/library | |
| parent | a0ab35b3f2c9be0e7e0fa8abf38b044b952e2847 (diff) | |
| parent | b32df7300c80dcf2255d3b0bc3915695a64709c3 (diff) | |
| download | kolla-083a21db4d6d1e3ffc3538be72769103dc4e5a95.tar.gz kolla-083a21db4d6d1e3ffc3538be72769103dc4e5a95.zip | |
Merge "Support v1 and v2 registry - kolla_docker"
Diffstat (limited to 'ansible/library')
| -rw-r--r-- | ansible/library/kolla_docker.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 32157d3d2..1b24f0ccb 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -217,9 +217,14 @@ class DockerWorker(object): ) ] - if "Downloaded newer image for" in status[-1].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. + search = -2 if 'legacy registry' in status[-1].get('status') else -1 + + if "Downloaded newer image for" in status[search].get('status'): self.changed = True - elif "Image is up to date for" in status[-1].get('status'): + elif "Image is up to date for" in status[search].get('status'): # No new layer was pulled, no change pass else: |