saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update mongo_future_return.py

Browse source
This commit is contained in:
rhealitycheck 2015-09-23 15:11:21 -05:00 • committed by rallytime
parent 5c753a54ff
commit 405edd0718
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/returners/mongo_future_return.py
View file

@ -129,13 +129,11 @@ def _get_conn(ret):
user = _options.get('user')
password = _options.get('password')
indexes = _options.get('indexes', False)
'''
at some point we should remove support for
pymongo versions < 2.3 until then there are
a bunch of these sections that need to be supported
'''
if float(version) > 2.3:
conn = pymongo.MongoClient(host, port)
else:
@ -149,14 +147,12 @@ def _get_conn(ret):
if float(version) > 2.3:
mdb.saltReturns.create_index('minion')
mdb.saltReturns.create_index('jid')
mdb.jobs.create_index('jid')
else:
mdb.saltReturns.ensure_index('minion')
mdb.saltReturns.ensure_index('jid')
mdb.jobs.ensure_index('jid')
return conn, mdb