From a9770fef24c008b551ff9b1b8cad584fb6f4e240 Mon Sep 17 00:00:00 2001
From: Colton Myers <colton.myers@gmail.com>
Date: Tue, 26 Apr 2016 13:52:09 -0600
Subject: [PATCH] Add ssh_use_home_key to master config docs/template

---
 conf/master                      |  4 ++++
 doc/ref/configuration/master.rst | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/conf/master b/conf/master
index c33e4bd6c6..64c09d50a9 100644
--- a/conf/master
+++ b/conf/master
@@ -350,6 +350,10 @@
 #ssh_minion_opts:
 #  gpg_keydir: /root/gpg
 
+# Set this to True to default to using ~/.ssh/id_rsa for salt-ssh
+# authentication with minions
+#ssh_use_home_key: False
+
 #####    Master Module Management    #####
 ##########################################
 # Manage how master side modules are loaded.
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index ba5376ae27..d4c0c2f028 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -620,9 +620,20 @@ overridden on a per-minion basis in the roster (``minion_opts``)
 
 .. code-block:: yaml
 
-    minion_opts:
+    ssh_minion_opts:
       gpg_keydir: /root/gpg
 
+``ssh_use_home_key``
+--------------------
+
+Default: False
+
+Set this to True to default to using ``~/.ssh/id_rsa`` for salt-ssh
+authentication with minions
+
+.. code-block:: yaml
+
+    ssh_use_home_key: False
 
 Master Security Settings
 ========================