Merge pull request #35500 from rallytime/fix-35068

Add docs for pillar_raise_on_missing option

conf/master

@@ -705,6 +705,11 @@
 # Recursively merge lists by aggregating them instead of replacing them.
 #pillar_merge_lists: False
 
+# Set this option to 'True' to force a 'KeyError' to be raised whenever an
+# attempt to retrieve a named value from pillar fails. When this option is set
+# to 'False', the failed attempt returns an empty string. Default is 'False'.
+#pillar_raise_on_missing: False
+
 # Git External Pillar (git_pillar) Configuration Options
 #
 # Specify the provider to be used for git_pillar. Must be either pygit2 or

conf/minion

@@ -471,6 +471,11 @@
 # as the environment setting, but for pillar instead of states.
 #pillarenv: None
 #
+# Set this option to 'True' to force a 'KeyError' to be raised whenever an
+# attempt to retrieve a named value from pillar fails. When this option is set
+# to 'False', the failed attempt returns an empty string. Default is 'False'.
+#pillar_raise_on_missing: False
+#
 # If using the local file directory, then the state top file name needs to be
 # defined, by default this is top.sls.
 #state_top: top.sls

doc/ref/configuration/master.rst

@@ -2429,6 +2429,19 @@ pillar_roots_override_ext_pillar option and will be removed in future releases.
 
     ext_pillar_first: False
 
+.. conf_master:: pillar_raise_on_missing
+
+``pillar_raise_on_missing``
+---------------------------
+
+.. versionadded:: 2015.5.0
+
+Default: ``False``
+
+Set this option to ``True`` to force a ``KeyError`` to be raised whenever an
+attempt to retrieve a named value from pillar fails. When this option is set
+to ``False``, the failed attempt returns an empty string.
+
 .. _git-pillar-config-opts:
 
 Git External Pillar (git_pillar) Configuration Options

doc/ref/configuration/minion.rst

@@ -1496,6 +1496,19 @@ the environment setting, but for pillar instead of states.
 
     pillarenv: None
 
+.. conf_minion:: pillar_raise_on_missing
+
+``pillar_raise_on_missing``
+---------------------------
+
+.. versionadded:: 2015.5.0
+
+Default: ``False``
+
+Set this option to ``True`` to force a ``KeyError`` to be raised whenever an
+attempt to retrieve a named value from pillar fails. When this option is set
+to ``False``, the failed attempt returns an empty string.
+
 .. conf_minion:: file_recv_max_size
 
 ``file_recv_max_size``