Browse Source

Add master.conf pillar_safe_render_error option

Change-Id: I3ddfb01dd785f559e4bbf197bc164b8d0389a4f1
pull/70/merge
Petr Michalec 7 years ago
parent
commit
bc015c3611
No account linked to committer's email address
4 changed files with 19 additions and 0 deletions
  1. +15
    -0
      README.rst
  2. +2
    -0
      salt/files/master.conf
  3. +1
    -0
      salt/map.jinja
  4. +1
    -0
      tests/pillar/master_single_extpillars.sls

+ 15
- 0
README.rst View File

:language: yaml :language: yaml




Common salt config options
--------------------------

Pass pillar render error to minion log.

.. Note: When set to `False` this option is great for debuging. However it is not recomended for
any production environment as it may contain templating data as passwords, etc...,
that minion should not have.

.. code-block:: yaml

salt:
master:
pillar_safe_render_error: False

Salt minion Salt minion
----------- -----------



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



pillar_opts: False pillar_opts: False


pillar_safe_render_error: {{ master.pillar_safe_render_error }}

{%- if master.accept_policy == 'open_mode' %} {%- if master.accept_policy == 'open_mode' %}
open_mode: True open_mode: True
{%- endif %} {%- endif %}

+ 1
- 0
salt/map.jinja View File

base_environment: dev base_environment: dev
dir: dir:
files: /srv/salt/env files: /srv/salt/env
pillar_safe_render_error: true
pillar: pillar:
engine: salt engine: salt
max_event_size: 100000000 max_event_size: 100000000

+ 1
- 0
tests/pillar/master_single_extpillars.sls View File

command_timeout: 5 command_timeout: 5
worker_threads: 2 worker_threads: 2
base_environment: prd base_environment: prd
pillar_safe_render_error: False
#environment: #environment:
# prd: # prd:
# formula: # formula:

Loading…
Cancel
Save