aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-05 03:34:28 +0000
committerGerrit Code Review <review@openstack.org>2016-08-05 03:34:28 +0000
commitb52edd573bb3bc9c8e0e75b1a90a6daaa4ff94e1 (patch)
treeea1a500b7e36194d2735e27ec2d4ec5d5322b24d /ansible
parent086cc02e908b69113a6140b90ae5de89f4d622b7 (diff)
parentae34973d350433ea22d7f0467100193832e6de0f (diff)
downloadkolla-b52edd573bb3bc9c8e0e75b1a90a6daaa4ff94e1.tar.gz
kolla-b52edd573bb3bc9c8e0e75b1a90a6daaa4ff94e1.zip
Merge "Fix the kolla_docker issue with docker 1.12"
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