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

Remove last remnants of daisychaining

Browse source
This commit is contained in:
Daniel Hokka Zakrisson 2013-01-28 17:46:35 +01:00
parent 5268d49bad
commit 0bfec51a04
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/get_url
View file

@ -255,8 +255,7 @@ def main():
# Mission complete # Mission complete
module.exit_json(url=url, dest=dest, src=tmpsrc, md5sum=md5sum_src, module.exit_json(url=url, dest=dest, src=tmpsrc, md5sum=md5sum_src,
changed=changed, msg=info.get('msg', ''), changed=changed, msg=info.get('msg', ''))
daisychain="file", daisychain_args=info.get('daisychain_args', ''))
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>

14
library/ini_file
View file

@ -153,8 +153,6 @@ def do_ini(module, filename, section=None, option=None, value=None, state='prese
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
# not checking because of daisy chain to file module
check_invalid_arguments = False,
argument_spec = dict( argument_spec = dict(
dest = dict(required=True), dest = dict(required=True),
section = dict(required=True), section = dict(required=True),
@ -162,7 +160,8 @@ def main():
value = dict(required=False), value = dict(required=False),
backup = dict(default='no', choices=BOOLEANS), backup = dict(default='no', choices=BOOLEANS),
state = dict(default='present', choices=['present', 'absent']) state = dict(default='present', choices=['present', 'absent'])
) ),
add_file_common_args = True
) )
info = dict() info = dict()
@ -176,14 +175,11 @@ def main():
changed = do_ini(module, dest, section, option, value, state, backup) changed = do_ini(module, dest, section, option, value, state, backup)
info['daisychain_args'] = module.params file_args = module.load_file_common_arguments(module.params)
info['daisychain_args']['state'] = 'file' changed = module.set_file_attributes_if_different(file_args, changed)
info['daisychain_args']['dest'] = dest
# Mission complete # Mission complete
module.exit_json(dest=dest, module.exit_json(dest=dest, changed=changed, msg="OK")
changed=changed, msg="OK",
daisychain="file", daisychain_args=info.get('daisychain_args',''))
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>