aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-13 17:56:29 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-04-13 17:56:29 +0800
commit9575417b15a7d7568e0c090838b10a7280287bec (patch)
tree6bf850914dbc8eb59d6e393899dbb6361831784d
parent030619535e07fb2683153d9e998ea0bfb7394844 (diff)
downloadkolla-9575417b15a7d7568e0c090838b10a7280287bec.tar.gz
kolla-9575417b15a7d7568e0c090838b10a7280287bec.zip
Fix the upgrade issue when image id is the same
When image id is the same, the container won't re-create with the latest image tag. Change-Id: I402ad275c388006248cb559851b01b0b963cf170 Closes-Bug: #1569723
-rw-r--r--ansible/library/kolla_docker.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py
index 844bb633e..37b645088 100644
--- a/ansible/library/kolla_docker.py
+++ b/ansible/library/kolla_docker.py
@@ -288,6 +288,7 @@ class DockerWorker(object):
def compare_image(self, container_info=None):
container_info = container_info or self.get_container_info()
+ parse_repository_tag = docker.utils.parse_repository_tag
if not container_info:
return True
new_image = self.check_image()
@@ -296,6 +297,11 @@ class DockerWorker(object):
return True
if new_image['Id'] != current_image:
return True
+ # NOTE(Jeffrey4l) when new image and the current image have
+ # the same id, but the tag name different.
+ elif (parse_repository_tag(container_info['Config']['Image']) !=
+ parse_repository_tag(self.params.get('image'))):
+ return True
def compare_labels(self, container_info):
new_labels = self.params.get('labels')