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

Merge pull request #916 from bobrik/less-docker-reloads-in-links-and-env

Browse source 
[docker] Not triggering reload for links and not string env variables
This commit is contained in:
Toshio Kuratomi 2015-03-09 15:26:07 -07:00
commit 6b38382e9d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cloud/docker/docker.py
View file

@ -850,7 +850,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 []:
@ -859,7 +859,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
@ -992,7 +992,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: