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

Improve mongodb_user exception (#2962)

Browse source 
- Better error message
This commit is contained in:
Lujeni 2016-09-20 16:19:53 +02:00 committed by Matt Clay
parent 46d0b4dc16
commit aa6aedf26c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/database/misc/mongodb_user.py
View file

@ -343,7 +343,7 @@ def main():
module.fail_json(msg='The localhost login exception only allows the first admin account to be created') module.fail_json(msg='The localhost login exception only allows the first admin account to be created')
#else: this has to be the first admin user added #else: this has to be the first admin user added
except ConnectionFailure, e: except Exception, e:
module.fail_json(msg='unable to connect to database: %s' % str(e)) module.fail_json(msg='unable to connect to database: %s' % str(e))
check_compatibility(module, client) check_compatibility(module, client)
@ -363,7 +363,7 @@ def main():
module.exit_json(changed=True, user=user) module.exit_json(changed=True, user=user)
user_add(module, client, db_name, user, password, roles) user_add(module, client, db_name, user, password, roles)
except OperationFailure, e: except Exception, e:
module.fail_json(msg='Unable to add or update user: %s' % str(e)) module.fail_json(msg='Unable to add or update user: %s' % str(e))
# Here we can check password change if mongo provide a query for that : https://jira.mongodb.org/browse/SERVER-22848 # Here we can check password change if mongo provide a query for that : https://jira.mongodb.org/browse/SERVER-22848
@ -374,7 +374,7 @@ def main():
elif state == 'absent': elif state == 'absent':
try: try:
user_remove(module, client, db_name, user) user_remove(module, client, db_name, user)
except OperationFailure, e: except Exception, e:
module.fail_json(msg='Unable to remove user: %s' % str(e)) module.fail_json(msg='Unable to remove user: %s' % str(e))
module.exit_json(changed=True, user=user) module.exit_json(changed=True, user=user)