ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

mount: Support for Check-Mode

Browse source
This commit is contained in:
fti7 2014-10-17 18:23:25 +02:00 • committed by Matt Clay
commit 581ce7dd32
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/system/mount.py
View file

@ -108,7 +108,7 @@ def _escape_fstab(v):
""" escape space (040), ampersand (046) and backslash (134) which are invalid in fstab fields """ """ escape space (040), ampersand (046) and backslash (134) which are invalid in fstab fields """
return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046') return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046')
def set_mount(**kwargs): def set_mount(module, **kwargs):
""" set/change a mount point location in fstab """ """ set/change a mount point location in fstab """
# kwargs: name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab # kwargs: name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab
@ -167,14 +167,14 @@ def set_mount(**kwargs):
to_write.append(new_line % args) to_write.append(new_line % args)
changed = True changed = True
if changed: if changed and not module.check_mode:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
# mount function needs origname # mount function needs origname
return (origname, changed) return (origname, changed)
def unset_mount(**kwargs): def unset_mount(module, **kwargs):
""" remove a mount point from fstab """ """ remove a mount point from fstab """
# kwargs: name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab # kwargs: name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab
@ -217,7 +217,7 @@ def unset_mount(**kwargs):
# if we got here we found a match - continue and mark changed # if we got here we found a match - continue and mark changed
changed = True changed = True
if changed: if changed and not module.check_mode:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
# umount needs origname # umount needs origname
@ -281,7 +281,8 @@ def main():
src = dict(required=True), src = dict(required=True),
fstype = dict(required=True), fstype = dict(required=True),
fstab = dict(default='/etc/fstab') fstab = dict(default='/etc/fstab')
) ),
supports_check_mode=True
) )
@ -316,8 +317,8 @@ def main():
state = module.params['state'] state = module.params['state']
name = module.params['name'] name = module.params['name']
if state == 'absent': if state == 'absent':
name, changed = unset_mount(**args) name, changed = unset_mount(module, **args)
if changed: if changed and not module.check_mode:
if os.path.ismount(name): if os.path.ismount(name):
res,msg = umount(module, **args) res,msg = umount(module, **args)
if res: if res:
@ -333,6 +334,7 @@ def main():
if state == 'unmounted': if state == 'unmounted':
if os.path.ismount(name): if os.path.ismount(name):
if not module.check_mode:
res,msg = umount(module, **args) res,msg = umount(module, **args)
if res: if res:
module.fail_json(msg="Error unmounting %s: %s" % (name, msg)) module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
@ -342,17 +344,17 @@ def main():
if state in ['mounted', 'present']: if state in ['mounted', 'present']:
if state == 'mounted': if state == 'mounted':
if not os.path.exists(name): if not os.path.exists(name) and not module.check_mode:
try: try:
os.makedirs(name) os.makedirs(name)
except (OSError, IOError), e: except (OSError, IOError), e:
module.fail_json(msg="Error making dir %s: %s" % (name, str(e))) module.fail_json(msg="Error making dir %s: %s" % (name, str(e)))
name, changed = set_mount(**args) name, changed = set_mount(module, **args)
if state == 'mounted': if state == 'mounted':
res = 0 res = 0
if os.path.ismount(name): if os.path.ismount(name):
if changed: if changed and not module.check_mode:
res,msg = mount(module, **args) res,msg = mount(module, **args)
elif 'bind' in args.get('opts', []): elif 'bind' in args.get('opts', []):
changed = True changed = True
@ -367,8 +369,10 @@ def main():
res,msg = mount(module, **args) res,msg = mount(module, **args)
else: else:
changed = True changed = True
if not module.check_mode:
res,msg = mount(module, **args) res,msg = mount(module, **args)
if res: if res:
module.fail_json(msg="Error mounting %s: %s" % (name, msg)) module.fail_json(msg="Error mounting %s: %s" % (name, msg))