cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix container labels expected vs actual comparison.

Browse source
This commit is contained in:
chouseknecht 2016-08-27 08:00:13 -04:00 committed by Matt Clay
parent e37f57fc90
commit 964b7ecffa
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/docker/_docker.py
View file

@ -1307,10 +1307,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))