Pārlūkot izejas kodu

Add master.conf pillar_safe_render_error option

Change-Id: I3ddfb01dd785f559e4bbf197bc164b8d0389a4f1
pull/70/merge
Petr Michalec pirms 7 gadiem
vecāks
revīzija
bc015c3611
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
4 mainītis faili ar 19 papildinājumiem un 0 dzēšanām
  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 Parādīt failu

@@ -476,6 +476,21 @@ Salt SSH with root using password
: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
-----------


+ 2
- 0
salt/files/master.conf Parādīt failu

@@ -40,6 +40,8 @@ file_roots:

pillar_opts: False

pillar_safe_render_error: {{ master.pillar_safe_render_error }}

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

+ 1
- 0
salt/map.jinja Parādīt failu

@@ -19,6 +19,7 @@ default:
base_environment: dev
dir:
files: /srv/salt/env
pillar_safe_render_error: true
pillar:
engine: salt
max_event_size: 100000000

+ 1
- 0
tests/pillar/master_single_extpillars.sls Parādīt failu

@@ -17,6 +17,7 @@ salt:
command_timeout: 5
worker_threads: 2
base_environment: prd
pillar_safe_render_error: False
#environment:
# prd:
# formula:

Notiek ielāde…
Atcelt
Saglabāt