wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

not triggering reload for links and not string env variables

Browse source
This commit is contained in:
Ian Babrou 2015-03-09 22:45:43 +03:00 committed by Matt Clay
parent 7c4e8774d8
commit 005d02b185
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker.py
View file

@ -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: