From 11efee54c37e16ae3c11b675ffc47b0877052cfd Mon Sep 17 00:00:00 2001
From: Andrew Vant <andrew.vant@rackspace.com>
Date: Fri, 3 Apr 2015 14:34:34 -0400
Subject: [PATCH 1/2] Added mine_functions to f_defaults.conf.

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

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index af8cdbc..3c234ca 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -185,6 +185,13 @@ id: {{ cfg_minion['id'] }}
 # The default interval is every 60 minutes.
 {{ get_config('mine_interval', '60') }}
 
+{%- if 'mine_functions' in cfg_minion %}
+mine_functions:
+{%- for func, args in cfg_minion['mine_functions'].items() %}
+  {{ func }}: {{ args }}
+{%- endfor %}
+{%- endif %}
+
 # To auto recover minions if master changes IP address (DDNS)
 #    auth_tries: 10
 #    auth_safemode: False

From 2d986eaa3fdd537d0de380aef43ee73d15443dea Mon Sep 17 00:00:00 2001
From: Andrew Vant <andrew.vant@rackspace.com>
Date: Fri, 3 Apr 2015 15:35:14 -0400
Subject: [PATCH 2/2] Updated pillar.example with mine example.

---
 pillar.example | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pillar.example b/pillar.example
index 66bb15d..ca41f63 100644
--- a/pillar.example
+++ b/pillar.example
@@ -66,6 +66,15 @@ salt:
         spam: sausage
         cheese: bread
 
+    # salt mine setup
+    mine_interval: 60
+    # mine_functions can be set at the top level of the pillar, and
+    # that is preferable because it doesn't affect the conf file and
+    # doesn't require a minion restart. However, you can configure it
+    # here instead if you really want to.
+    mine_functions:
+      network.interface_ip: [eth0]
+
   # salt cloud config
   cloud:
     master: salt