execute the mount after path validation

This avoids a stale situation where name/path contains some impossible path,
but gets configured (faultly) in fstab, and the module only fails after that,
when creating that path.
release1.7.1
Serge van Ginderachter 11 years ago committed by James Cammarata
parent 3121008475
commit 1dd484cc2d

@ -307,7 +307,6 @@ def main():
module.exit_json(changed=changed, **args) module.exit_json(changed=changed, **args)
if state in ['mounted', 'present']: if state in ['mounted', 'present']:
name, changed = set_mount(**args)
if state == 'mounted': if state == 'mounted':
if not os.path.exists(name): if not os.path.exists(name):
try: try:
@ -315,6 +314,8 @@ def main():
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)
if state == 'mounted':
res = 0 res = 0
if os.path.ismount(name): if os.path.ismount(name):
if changed: if changed:

Loading…
Cancel
Save