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

docker: Fix state=reloaded to detect default LoggingDriver for docker

Browse source 
Previously the logging module hard coded the default logging driver. This means
if the docker daemon is started with a different logging driver, the ansible
module would continually restart it when run.

This fix adds a call to docker.Client.info(), which is inspected if a logging
driver is not supplied in the playbook, and the container only restarted if
the logging driver applied differs from the configured default.

In usage, this has solved issues with using alternative logging drivers.
This commit is contained in:
Will Rouesnel 2015-11-24 00:30:42 +11:00
parent 3a9d046f96
commit 7237798f20
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cloud/docker/docker.py
View file

@ -1017,6 +1017,7 @@ class DockerManager(object):
running = self.get_running_containers() running = self.get_running_containers()
current = self.get_inspect_containers(running) current = self.get_inspect_containers(running)
defaults = self.client.info()
#Get API version #Get API version
api_version = self.client.version()['ApiVersion'] api_version = self.client.version()['ApiVersion']
@ -1288,7 +1289,7 @@ class DockerManager(object):
# LOG_DRIVER # LOG_DRIVER
if self.ensure_capability('log_driver', False): if self.ensure_capability('log_driver', False):
expected_log_driver = self.module.params.get('log_driver') or 'json-file' expected_log_driver = self.module.params.get('log_driver') or defaults['LoggingDriver']
actual_log_driver = container['HostConfig']['LogConfig']['Type'] actual_log_driver = container['HostConfig']['LogConfig']['Type']
if actual_log_driver != expected_log_driver: if actual_log_driver != expected_log_driver:
self.reload_reasons.append('log_driver ({0} => {1})'.format(actual_log_driver, expected_log_driver)) self.reload_reasons.append('log_driver ({0} => {1})'.format(actual_log_driver, expected_log_driver))