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

Merge pull request #10421 from sivel/empty-error-msg

Browse source 
rax module ultis: Prevent an empty error message
This commit is contained in:
Brian Coca 2015-03-10 12:38:13 -04:00
commit cbfab13b89
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/rax.py
View file

@ -315,7 +315,11 @@ def setup_rax_module(module, rax_module, region_required=True):
else:
raise Exception('No credentials supplied!')
except Exception, e:
module.fail_json(msg='%s' % e.message)
if e.message:
msg = str(e.message)
else:
msg = repr(e)
module.fail_json(msg=msg)
if region_required and region not in rax_module.regions:
module.fail_json(msg='%s is not a valid region, must be one of: %s' %