瀏覽代碼

Add support for mongodb connection settings to config templates.

Signed-off-by: Rene Jochum <rene@jochums.at>
tags/v0.57.0
Rene Jochum 8 年之前
父節點
當前提交
6ae81a9640
共有 2 個檔案被更改,包括 29 行新增1 行删除
  1. +14
    -0
      salt/files/master.d/f_defaults.conf
  2. +15
    -1
      salt/files/minion.d/f_defaults.conf

+ 14
- 0
salt/files/master.d/f_defaults.conf 查看文件

@@ -1379,4 +1379,18 @@ consul_config:
{%- for name, value in cfg_master['consul_config'].items() %}
{{ name }}: {{ value }}
{%- endfor %}
{%- endif %}

{% if 'mongo' in cfg_master -%}
##### mongodb connection settings #####
##########################################
{%- for name, value in cfg_master['mongo'].items() %}
mongo.{{ name }}: {{ value }}
{%- endfor %}

{% if 'alternative.mongo' in cfg_master -%}
{%- for name, value in cfg_master['alternative.mongo'].items() %}
alternative.mongo.{{ name }}: {{ value }}
{%- endfor %}
{% endif %}
{%- endif %}

+ 15
- 1
salt/files/minion.d/f_defaults.conf 查看文件

@@ -990,4 +990,18 @@ ext_pillar:
############################################
# Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch
#event_match_type: startswith
{{ get_config('event_match_type', 'startswith') }}
{{ get_config('event_match_type', 'startswith') }}

{% if 'mongo' in cfg_minion -%}
##### mongodb connection settings #####
##########################################
{%- for name, value in cfg_minion['mongo'].items() %}
mongo.{{ name }}: {{ value }}
{%- endfor %}

{% if 'alternative.mongo' in cfg_minion -%}
{%- for name, value in cfg_minion['alternative.mongo'].items() %}
alternative.mongo.{{ name }}: {{ value }}
{%- endfor %}
{% endif %}
{%- endif %}

Loading…
取消
儲存