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

Merge pull request #8180 from sergevanginderachter/empty_nfs_mount_path

Browse source 
mount module: execute the mount only after path validation
This commit is contained in:
Michael DeHaan 2014-08-08 11:18:25 -04:00
commit 218ada5544
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
system/mount
View file

@ -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: