From d568c73c76eef617ff10621d3c2f39665283f807 Mon Sep 17 00:00:00 2001
From: Benedikt Werner <1benediktwerner@gmail.com>
Date: Tue, 10 Oct 2017 15:03:18 +0200
Subject: [PATCH] Prepend root dir config to autosign_grains_dir

---
 conf/master                      | 2 +-
 conf/suse/master                 | 2 +-
 doc/ref/configuration/master.rst | 3 ++-
 salt/config/__init__.py          | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/conf/master b/conf/master
index 50aba9f03b6..651db358437 100644
--- a/conf/master
+++ b/conf/master
@@ -36,7 +36,7 @@
 
 # The root directory prepended to these options: pki_dir, cachedir,
 # sock_dir, log_file, autosign_file, autoreject_file, extension_modules,
-# key_logfile, pidfile:
+# key_logfile, pidfile, autosign_grains_dir:
 #root_dir: /
 
 # The path to the master's configuration file.
diff --git a/conf/suse/master b/conf/suse/master
index 3a52ea0a4dc..ee67c6538c1 100644
--- a/conf/suse/master
+++ b/conf/suse/master
@@ -37,7 +37,7 @@ syndic_user: salt
 
 # The root directory prepended to these options: pki_dir, cachedir,
 # sock_dir, log_file, autosign_file, autoreject_file, extension_modules,
-# key_logfile, pidfile:
+# key_logfile, pidfile, autosign_grains_dir:
 #root_dir: /
 
 # The path to the master's configuration file.
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index 05949b1cd2a..6f8d22c4956 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -140,7 +140,8 @@ an alternative root.
     This directory is prepended to the following options:
     :conf_master:`pki_dir`, :conf_master:`cachedir`, :conf_master:`sock_dir`,
     :conf_master:`log_file`, :conf_master:`autosign_file`,
-    :conf_master:`autoreject_file`, :conf_master:`pidfile`.
+    :conf_master:`autoreject_file`, :conf_master:`pidfile`,
+    :conf_master:`autosign_grains_dir`.
 
 .. conf_master:: conf_file
 
diff --git a/salt/config/__init__.py b/salt/config/__init__.py
index a0ed6b77bc0..bee1e6d49f3 100644
--- a/salt/config/__init__.py
+++ b/salt/config/__init__.py
@@ -2400,7 +2400,7 @@ def syndic_config(master_config_path,
     # Prepend root_dir to other paths
     prepend_root_dirs = [
         'pki_dir', 'cachedir', 'pidfile', 'sock_dir', 'extension_modules',
-        'autosign_file', 'autoreject_file', 'token_dir'
+        'autosign_file', 'autoreject_file', 'token_dir', 'autosign_grains_dir'
     ]
     for config_key in ('log_file', 'key_logfile', 'syndic_log_file'):
         # If this is not a URI and instead a local path
@@ -3772,7 +3772,7 @@ def apply_master_config(overrides=None, defaults=None):
     prepend_root_dirs = [
         'pki_dir', 'cachedir', 'pidfile', 'sock_dir', 'extension_modules',
         'autosign_file', 'autoreject_file', 'token_dir', 'syndic_dir',
-        'sqlite_queue_dir'
+        'sqlite_queue_dir', 'autosign_grains_dir'
     ]
 
     # These can be set to syslog, so, not actual paths on the system