aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-08-01 13:35:25 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-08-01 13:41:05 +0800
commitae34973d350433ea22d7f0467100193832e6de0f (patch)
tree60f9d98e786d4ca47f1cc7dbadd79979d4376d1a /ansible
parente5ca547f373bdae7207236190422fd18840dd711 (diff)
downloadkolla-ae34973d350433ea22d7f0467100193832e6de0f.tar.gz
kolla-ae34973d350433ea22d7f0467100193832e6de0f.zip
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
Diffstat (limited to 'ansible')
-rw-r--r--ansible/library/kolla_docker.py5
1 files changed, 4 insertions, 1 deletions
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