Browse Source

Add support for mongodb connection settings to config templates.

Signed-off-by: Rene Jochum <rene@jochums.at>
master
Rene Jochum 8 years ago
parent
commit
6ae81a9640
2 changed files with 29 additions and 1 deletions
  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 View File

{%- for name, value in cfg_master['consul_config'].items() %} {%- for name, value in cfg_master['consul_config'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{%- endfor %} {%- 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 %} {%- endif %}

+ 15
- 1
salt/files/minion.d/f_defaults.conf View File

############################################ ############################################
# Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch # Default match type for filtering events tags: startswith, endswith, find, regex, fnmatch
#event_match_type: startswith #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…
Cancel
Save