From ae34973d350433ea22d7f0467100193832e6de0f Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 1 Aug 2016 13:35:25 +0800 Subject: Fix the kolla_docker issue with docker 1.12 After docker 1.12, the RepoTags will be None rather than [] in the image list API. This PS will handle the both case. Change-Id: Ie2da44b44229c2f190550755b50876f607f9cc0c Closes-Bug: #1608358 --- ansible/library/kolla_docker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ansible') diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index dc542aece..8a079e0f2 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -242,7 +242,10 @@ class DockerWorker(object): def check_image(self): find_image = ':'.join(self.parse_image()) for image in self.dc.images(): - for image_name in image['RepoTags']: + repo_tags = image.get('RepoTags') + if not repo_tags: + continue + for image_name in repo_tags: if image_name == find_image: return image -- cgit v1.2.3