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

Don't add file module arguments by default

Browse source 
This allows the postgresql_db module to work properly, as it uses
an argument named owner that conflicts with the file module.
This commit is contained in:
Daniel Hokka Zakrisson 2012-10-28 11:14:29 +01:00
parent 457cdb2be0
commit 55a1473d50
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_common.py
View file

@ -88,7 +88,7 @@ class AnsibleModule(object):
def __init__(self, argument_spec, bypass_checks=False, no_log=False,
check_invalid_arguments=True, mutually_exclusive=None, required_together=None,
required_one_of=None, add_file_common_args=True):
required_one_of=None, add_file_common_args=False):
'''
common code for quickly building an ansible module in Python
@ -458,7 +458,7 @@ class AnsibleModule(object):
default = v.get('default', None)
if pre == True:
# this prevents setting defaults on required items
if default and k not in self.params:
if default is not None and k not in self.params:
self.params[k] = default
else:
# make sure things without a default still get set None