Make env param a dict type instead of list

Also modifies param type checking code to remove whitespace from
around params before splitting them into k=v pairs.

Fixes #8199
reviewable/pr18780/r1
James Cammarata 10 years ago
parent 246b589c22
commit f729ab8e67

@ -411,9 +411,7 @@ class DockerManager:
if self.module.params.get('links'): if self.module.params.get('links'):
self.links = self.get_links(self.module.params.get('links')) self.links = self.get_links(self.module.params.get('links'))
self.env = None self.env = self.module.params.get('env', None)
if self.module.params.get('env'):
self.env = dict(map(lambda x: x.split("=", 1), self.module.params.get('env')))
# connect to docker server # connect to docker server
docker_url = urlparse(module.params.get('docker_url')) docker_url = urlparse(module.params.get('docker_url'))
@ -706,7 +704,7 @@ def main():
password = dict(), password = dict(),
email = dict(), email = dict(),
hostname = dict(default=None), hostname = dict(default=None),
env = dict(type='list'), env = dict(type='dict'),
dns = dict(), dns = dict(),
detach = dict(default=True, type='bool'), detach = dict(default=True, type='bool'),
state = dict(default='running', choices=['absent', 'present', 'running', 'stopped', 'killed', 'restarted']), state = dict(default='running', choices=['absent', 'present', 'running', 'stopped', 'killed', 'restarted']),

Loading…
Cancel
Save