From e226211c5b11d7812aeaedc4b0630d4525dff7a3 Mon Sep 17 00:00:00 2001 From: Lujeni Date: Mon, 26 Sep 2016 13:17:08 +0200 Subject: [PATCH] Fix mongodb_user ssl_cert_reqs param (#2963) (#2965) --- .../extras/database/misc/mongodb_user.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/ansible/modules/extras/database/misc/mongodb_user.py b/lib/ansible/modules/extras/database/misc/mongodb_user.py index e0d1342bc4..4d628ef220 100644 --- a/lib/ansible/modules/extras/database/misc/mongodb_user.py +++ b/lib/ansible/modules/extras/database/misc/mongodb_user.py @@ -313,20 +313,24 @@ def main(): password = module.params['password'] ssl = module.params['ssl'] ssl_cert_reqs = None - if ssl: - ssl_cert_reqs = getattr(ssl_lib, module.params['ssl_cert_reqs']) roles = module.params['roles'] or [] state = module.params['state'] update_password = module.params['update_password'] try: + connection_params = { + "host": login_host, + "port": int(login_port), + } + if replica_set: - client = MongoClient(login_host, int(login_port), - replicaset=replica_set, ssl=ssl, - ssl_cert_reqs=ssl_cert_reqs) - else: - client = MongoClient(login_host, int(login_port), ssl=ssl, - ssl_cert_reqs=ssl_cert_reqs) + connection_params["replicaset"] = replica_set + + if ssl: + connection_params["ssl"] = ssl + connection_params["ssl_cert_reqs"] = getattr(ssl_lib, module.params['ssl_cert_reqs']) + + client = MongoClient(**connection_params) if login_user is None and login_password is None: mongocnf_creds = load_mongocnf()