Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add SSL support to Elasticsearch
[salt-formulas/elasticsearch.git]
/
elasticsearch
/
meta
/
salt.yml
diff --git
a/elasticsearch/meta/salt.yml
b/elasticsearch/meta/salt.yml
index bfd5e0faf965faf56d8b2a4b155f1017147f7c4f..a34e0dbb1e3db01fb75e2ee914a458434cc36136 100644
(file)
--- a/
elasticsearch/meta/salt.yml
+++ b/
elasticsearch/meta/salt.yml
@@
-1,7
+1,7
@@
minion:
minion:
- {%- if pillar.
elasticsearch.client is defined
%}
+ {%- if pillar.
get('elasticsearch', {}).get('client')
%}
elasticsearch:
{%- from "elasticsearch/map.jinja" import client with context %}
elasticsearch:
elasticsearch:
{%- from "elasticsearch/map.jinja" import client with context %}
elasticsearch:
- host: {{client.server.host}}:{{client.server.port}}
+ host: {{
client.server.get("scheme", "http") }}://{{
client.server.host}}:{{client.server.port}}
{%- endif %}
{%- endif %}