From 48941291c17fa2c40e81e876fedc1872e75a8181 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Sat, 27 Aug 2016 08:00:13 -0400 Subject: [PATCH] Fix container labels expected vs actual comparison. --- cloud/docker/_docker.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cloud/docker/_docker.py b/cloud/docker/_docker.py index 4d39898e1b3..bab50fcbb86 100644 --- a/cloud/docker/_docker.py +++ b/cloud/docker/_docker.py @@ -1303,10 +1303,12 @@ class DockerManager(object): for name, value in self.module.params.get('labels').iteritems(): expected_labels[name] = str(value) - actual_labels = {} - for container_label in container['Config']['Labels'] or []: - name, value = container_label.split('=', 1) - actual_labels[name] = value + if type(container['Config']['Labels']) is dict: + actual_labels = container['Config']['Labels'] + else: + for container_label in container['Config']['Labels'] or []: + name, value = container_label.split('=', 1) + actual_labels[name] = value if actual_labels != expected_labels: self.reload_reasons.append('labels {0} => {1}'.format(actual_labels, expected_labels))