From 09ca116f5859c9ba01b60e26d7731931b731a4f7 Mon Sep 17 00:00:00 2001
From: John Carlyle-Clarke <john.carlyle-clarke@fastmarkets.com>
Date: Thu, 9 Jul 2015 10:43:36 +0100
Subject: [PATCH] Add master_type and master_retry_interval to minion config

---
 salt/files/minion.d/f_defaults.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index 3e743c9..c81113f 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -43,6 +43,12 @@ master:
 # choose a random master
 {{ get_config('random_master', 'False') }}
 
+# Set the master type
+{{ get_config('master_type', 'str') }}
+
+# Set the master alive interval (if master type set to failover)
+{{ get_config('master_alive_interval', '30') }}
+
 # use IPv6
 {{ get_config('ipv6', 'False') }}