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

Update docker module to avoid false positives when containers are first created. Also have the module check for api compatibility before trying to set a "--log-driver" option.

Browse source
This commit is contained in:
Ryan Walls 2015-06-01 09:48:24 -06:00 committed by Matt Clay
parent f5c1d8141b
commit 9630972c2c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1138,12 +1138,13 @@ class DockerManager(object):
# LOG_DRIVER
expected_log_driver = set(self.module.params.get('log_driver') or [])
actual_log_driver = set(container['HostConfig']['LogConfig']['Type'] or [])
if actual_log_driver != expected_log_driver:
self.reload_reasons.append('log_driver ({0} => {1})'.format(actual_log_driver, expected_log_driver))
differing.append(container)
continue
if self.ensure_capability('log_driver', false) :
expected_log_driver = self.module.params.get('log_driver') or 'json-file'
actual_log_driver = container['HostConfig']['LogConfig']['Type']
if actual_log_driver != expected_log_driver:
self.reload_reasons.append('log_driver ({0} => {1})'.format(actual_log_driver, expected_log_driver))
differing.append(container)
continue
return differing