Browse Source

Merge pull request #16 from smolaon/master

added log_level to salt minion
tags/2016.12
Filip Pytloun 8 years ago
parent
commit
27b93975f1
2 changed files with 4 additions and 0 deletions
  1. +2
    -0
      salt/files/minion.conf
  2. +2
    -0
      salt/map.jinja

+ 2
- 0
salt/files/minion.conf View File



{%- endif %} {%- endif %}


log_level: {{ minion.log.level }}

{%- if minion.sentry is defined %} {%- if minion.sentry is defined %}
sentry_handler: sentry_handler:
{% for server in minion.sentry.servers %} {% for server in minion.sentry.servers %}

+ 2
- 0
salt/map.jinja View File

- python-pydot - python-pydot
- python-yaml - python-yaml
graph_states: False graph_states: False
log:
level: info
service: salt-minion service: salt-minion
{%- if pillar.salt.get('minion', {}).get('source', {}).get('engine', 'pkg') == 'pkg' %} {%- if pillar.salt.get('minion', {}).get('source', {}).get('engine', 'pkg') == 'pkg' %}
install_state: "pkg: salt_minion_packages" install_state: "pkg: salt_minion_packages"

Loading…
Cancel
Save