Add master.conf pillar_safe_render_error option

Change-Id: I3ddfb01dd785f559e4bbf197bc164b8d0389a4f1

README.rst

@@ -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
 -----------
 

salt/files/master.conf

@@ -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 %}

salt/map.jinja

@@ -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

tests/pillar/master_single_extpillars.sls

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