[Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update (#359)

* Minion/returner/elasticsearch yaml read fix.

* Improved the documentation for the elasticsearch returner
This commit is contained in:
Felix Russell authored and Niels Abspoel committed 2018-04-17 22:26:45 +02:00
1 parent 32d9a9467d
commit 9f33d2afe1
2 files changed
+24 -3

No files matched your search

+5 -3
View File
@@ -1215,16 +1215,18 @@ return:
{% if 'elasticsearch' in cfg_minion -%}
{%- do default_keys.append('elasticsearch') %}
{%- do default_keys.append('return') %}
##### elasticsearch connection settings #####
##########################################
elasticsearch:
{%- for name, value in cfg_minion['elasticsearch'].items() %}
{%- if value is list %}
elasticsearch.{{ name }}:
{{ name }}:
{%- for objvalue in value %}
- {{ objvalue }}
- {{ objvalue }}
{%- endfor %}
{%- else %}
elasticsearch.{{ name }}: {{ value }}
{{ name }}: {{ value }}
{%- endif %}
{%- endfor %}
{%- endif %}