valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #41373 from alex-zel/patch-3

Browse Source 
Allow HTTP authentication to ES.
This commit is contained in:
Mike Place 2017-05-22 10:32:09 -05:00 committed by GitHub
commit 5edfcf972c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/modules/elasticsearch.py
View File

@ -84,13 +84,27 @@ def _get_instance(hosts=None, profile=None):
hosts = _profile.get('host', None)
if not hosts:
hosts = _profile.get('hosts', None)
use_ssl = _profile.get('use_ssl', False)
ca_certs = _profile.get('ca_certs', False)
verify_certs = _profile.get('verify_certs', False)
username = _profile.get('username', None)
password = _profile.get('password', None)
if not hosts:
hosts = ['127.0.0.1:9200']
if isinstance(hosts, string_types):
hosts = [hosts]
try:
es = elasticsearch.Elasticsearch(hosts)
if username and password:
es = elasticsearch.Elasticsearch(
hosts,
use_ssl=use_ssl,
ca_certs=ca_certs,
verify_certs=verify_certs,
http_auth=(username, password)
)
else:
es = elasticsearch.Elasticsearch(hosts)
if not es.ping():
raise CommandExecutionError('Could not connect to Elasticsearch host/ cluster {0}, is it unhealthy?'.format(hosts))
except elasticsearch.exceptions.ConnectionError: