From b32df7300c80dcf2255d3b0bc3915695a64709c3 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Fri, 1 Jan 2016 02:49:02 +0000 Subject: [PATCH] Support v1 and v2 registry - kolla_docker Change-Id: I452c9c507c51b68f7515b9295b05e98a39554531 Partially-Implements: blueprint kolla-docker-module --- ansible/library/kolla_docker.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index b2006b4359..13870eaee4 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: