Merge pull request #9985 from makinacorpus/graindirs

Custom grains directories

doc/ref/configuration/minion.rst

@@ -393,6 +393,21 @@ A list of extra directories to search for Salt states
       - /var/lib/salt/states
 
 
+.. conf_minion:: grains_dirs
+
+``grains_dirs``
+---------------
+
+Default: ``[]``
+
+A list of extra directories to search for Salt grains
+
+.. code-block:: yaml
+
+    grains_dirs:
+      - /var/lib/salt/grains
+
+
 .. conf_minion:: render_dirs
 
 ``render_dirs``

salt/config.py

@@ -74,6 +74,7 @@ VALID_OPTS = {
     'module_dirs': list,
     'returner_dirs': list,
     'states_dirs': list,
+    'grains_dirs': list,
     'render_dirs': list,
     'outputter_dirs': list,
     'providers': dict,
@@ -223,6 +224,7 @@ DEFAULT_MINION_OPTS = {
     'whitelist_modules': [],
     'module_dirs': [],
     'returner_dirs': [],
+    'grains_dirs': [],
     'states_dirs': [],
     'render_dirs': [],
     'outputter_dirs': [],