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

make master job cache index configurable

Browse source
This commit is contained in:
Michael Steed 2015-09-10 17:55:07 -06:00
parent bc041fa4a7
commit 5d2fae8a89
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/returners/elasticsearch_return.py
View file

@ -123,7 +123,7 @@ def save_load(jid, load):
'''
Save the load to the specified jid id
'''
index = 'salt-master-job-cache'
index = __salt__['config.option']('elasticsearch:master_job_cache_index', 'salt-master-job-cache')
doc_type = __salt__['config.option']('elasticsearch:master_job_cache_doc_type', 'default')
index_exists = __salt__['elasticsearch.index_exists'](index)
@ -147,7 +147,7 @@ def get_load(jid):
'''
Return the load data that marks a specified jid
'''
index = 'salt-master_job_cache'
index = __salt__['config.option']('elasticsearch:master_job_cache_index', 'salt-master-job-cache')
doc_type = __salt__['config.option']('elasticsearch:master_job_cache_doc_type', 'default')
data = __salt__['elasticsearch.document_get'](index=index, id=jid, doc_type=doc_type)