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

Improve/fix type checking for docker module

Browse source 
tls_* point to files, so should be type=path
count is a int, so tag it as such and avoid converting later
password should be tagged as no_log
This commit is contained in:
Michael Scherer 2016-03-21 00:42:05 +01:00 committed by Matt Clay
parent 7c5b4b142a
commit daddfb490b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1857,7 +1857,7 @@ def absent(manager, containers, count, name):
def main():
module = AnsibleModule(
argument_spec = dict(
count = dict(default=1),
count = dict(default=1, type='int'),
image = dict(required=True),
pull = dict(required=False, default='missing', choices=['missing', 'always']),
entrypoint = dict(required=False, default=None, type='str'),
@ -1874,14 +1874,14 @@ def main():
cpu_shares = dict(default=0),
docker_url = dict(),
use_tls = dict(default=None, choices=['no', 'encrypt', 'verify']),
tls_client_cert = dict(required=False, default=None, type='str'),
tls_client_key = dict(required=False, default=None, type='str'),
tls_ca_cert = dict(required=False, default=None, type='str'),
tls_client_cert = dict(required=False, default=None, type='path'),
tls_client_key = dict(required=False, default=None, type='path'),
tls_ca_cert = dict(required=False, default=None, type='path'),
tls_hostname = dict(required=False, type='str', default=None),
docker_api_version = dict(required=False, default=DEFAULT_DOCKER_API_VERSION, type='str'),
docker_user = dict(default=None),
username = dict(default=None),
password = dict(),
password = dict(no_log=True),
email = dict(),
registry = dict(),
hostname = dict(default=None),
@ -1924,7 +1924,7 @@ def main():
try:
manager = DockerManager(module)
count = int(module.params.get('count'))
count = module.params.get('count')
name = module.params.get('name')
pull = module.params.get('pull')