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

Make purefa_pgsnap module handle its own exit correctly

Browse source 
(cherry picked from commit d4c0269fbb)
This commit is contained in:
Simon Dodsley 2019-05-25 09:43:28 -04:00 • committed by Toshio Kuratomi
parent daef4d9c95
commit 35ffd2825d
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56954-purefa_pgsnap_handle_exit_correctly.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "purefa_pgsnap - handle exit correctly if selected remote volume or snapshot does not exist."

6
lib/ansible/modules/storage/purestorage/purefa_pgsnap.py
View file

@ -235,8 +235,12 @@ def main():
module.fail_json(msg="Selected volume {0} does not exist in the Protection Group".format(module.params['name']))
if ":" in module.params['name']:
rvolume = get_rpgsnapshot(module, array)
if rvolume is None:
module.fail_json(msg="Selected restore snapshot {0} does not exist in the Protection Group".format(module.params['restore']))
else:
rvolume = get_pgroupvolume(module, array)
if rvolume is None:
module.fail_json(msg="Selected restore volume {0} does not exist in the Protection Group".format(module.params['restore']))
if state == 'copy' and rvolume:
restore_pgsnapvolume(module, array)
@ -251,6 +255,8 @@ def main():
elif state == 'absent' and not pgsnap:
module.exit_json(changed=False)
module.exit_json(changed=False)
if __name__ == '__main__':
main()