openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support v1 and v2 registry - kolla_docker"

Browse Source
This commit is contained in:
Jenkins 2016-01-04 07:13:31 +00:00 committed by Gerrit Code Review
commit 083a21db4d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/library/kolla_docker.py
View File

@ -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 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 # No new layer was pulled, no change
pass pass
else: else: