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

Merge pull request #561 from weitzj/bugfix/docker-extra-params

Browse source 
Fixes invalid dictionary access.
This commit is contained in:
Toshio Kuratomi 2014-12-24 14:58:57 -08:00
commit 925c9ab42d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/docker/docker.py
View file

@ -726,6 +726,8 @@ class DockerManager(object):
'name': self.module.params.get('name'), 'name': self.module.params.get('name'),
'stdin_open': self.module.params.get('stdin_open'), 'stdin_open': self.module.params.get('stdin_open'),
'tty': self.module.params.get('tty'), 'tty': self.module.params.get('tty'),
'dns': self.module.params.get('dns'),
'volumes_from': self.module.params.get('volumes_from'),
} }
if params['dns'] is not None: if params['dns'] is not None:
@ -783,7 +785,7 @@ class DockerManager(object):
'network_mode': self.module.params.get('net'), 'network_mode': self.module.params.get('net'),
} }
optionals = [] optionals = {}
for optional_param in ('dns', 'volumes_from', 'restart_policy', 'restart_policy_retry'): for optional_param in ('dns', 'volumes_from', 'restart_policy', 'restart_policy_retry'):
optionals[optional_param] = self.module.params.get(optional_param) optionals[optional_param] = self.module.params.get(optional_param)