Merge pull request #8180 from sergevanginderachter/empty_nfs_mount_path
mount module: execute the mount only after path validation
This commit is contained in:
commit
218ada5544
1 changed files with 2 additions and 1 deletions
|
@ -307,7 +307,6 @@ def main():
|
|||
module.exit_json(changed=changed, **args)
|
||||
|
||||
if state in ['mounted', 'present']:
|
||||
name, changed = set_mount(**args)
|
||||
if state == 'mounted':
|
||||
if not os.path.exists(name):
|
||||
try:
|
||||
|
@ -315,6 +314,8 @@ def main():
|
|||
except (OSError, IOError), e:
|
||||
module.fail_json(msg="Error making dir %s: %s" % (name, str(e)))
|
||||
|
||||
name, changed = set_mount(**args)
|
||||
if state == 'mounted':
|
||||
res = 0
|
||||
if os.path.ismount(name):
|
||||
if changed:
|
||||
|
|
Loading…
Reference in a new issue