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

Merge pull request #43698 from theredcat/elastic-timeout

Browse source 
Add timeout option to elasticsearch execution module
This commit is contained in:
Mike Place 2017-09-22 11:30:14 -06:00 • committed by GitHub
commit 530a6bb2e7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/elasticsearch.py
View file

@ -88,6 +88,7 @@ def _get_instance(hosts=None, profile=None):
ca_certs = None
verify_certs = True
http_auth = None
timeout = 10
if profile is None:
profile = 'elasticsearch'
@ -106,6 +107,7 @@ def _get_instance(hosts=None, profile=None):
verify_certs = _profile.get('verify_certs', True)
username = _profile.get('username', None)
password = _profile.get('password', None)
timeout = _profile.get('timeout', 10)
if username and password:
http_auth = (username, password)
@ -131,6 +133,7 @@ def _get_instance(hosts=None, profile=None):
ca_certs=ca_certs,
verify_certs=verify_certs,
http_auth=http_auth,
timeout=timeout,
)
else:
es = elasticsearch.Elasticsearch(
@ -139,6 +142,7 @@ def _get_instance(hosts=None, profile=None):
ca_certs=ca_certs,
verify_certs=verify_certs,
http_auth=http_auth,
timeout=timeout,
)
# Try the connection