From 005d02b1859f783fc2c7a4d69e188aad82dc78f3 Mon Sep 17 00:00:00 2001 From: Ian Babrou Date: Mon, 9 Mar 2015 22:45:43 +0300 Subject: [PATCH] not triggering reload for links and not string env variables --- lib/ansible/modules/cloud/docker/docker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index 8c972b903d7..6e864994b49 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -854,7 +854,7 @@ class DockerManager(object): if self.env: for name, value in self.env.iteritems(): - expected_env[name] = value + expected_env[name] = str(value) actual_env = {} for container_env in container['Config']['Env'] or []: @@ -863,7 +863,7 @@ class DockerManager(object): if actual_env != expected_env: # Don't include the environment difference in the output. - self.reload_reasons.append('environment') + self.reload_reasons.append('environment {0} => {1}'.format(actual_env, expected_env)) differing.append(container) continue @@ -996,7 +996,7 @@ class DockerManager(object): expected_links = set() for link, alias in (self.links or {}).iteritems(): - expected_links.add("/{0}:/running/{1}".format(link, alias)) + expected_links.add("/{0}:{1}/{2}".format(link, container["Name"], alias)) actual_links = set(container['HostConfig']['Links'] or []) if actual_links != expected_links: