From fa6c39eccde62b484ec8e911c875f9f7a8296711 Mon Sep 17 00:00:00 2001
From: Nitin Madhok <nmadhok@g.clemson.edu>
Date: Fri, 16 Jan 2015 02:20:43 +0530
Subject: [PATCH] Revert "Add mine_functions to master config template"

---
 pillar.example                     |  5 -----
 salt/files/master.d/_defaults.conf | 17 -----------------
 2 files changed, 22 deletions(-)

diff --git a/pillar.example b/pillar.example
index abf2f82..5aacc2c 100644
--- a/pillar.example
+++ b/pillar.example
@@ -9,11 +9,6 @@ salt:
     file_roots:
       base:
         - /srv/salt
-    mine_functions:
-      network.interfaces: []
-      network.ip_addrs: []
-      grains.items: []
-
   minion:
     master: salt
     fileserver_backend:
diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index 1c55d41..0f9e297 100644
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@@ -817,23 +817,6 @@ peer_run:
 #   web.*:
 #     - network.*
 #     - disk.*
-{% if 'mine_functions' in cfg_master %}
-mine_functions:
-  {% for name, roots in cfg_master['mine_functions'].items() %}
-  {{ name }}:
-    {% for mod in roots %}
-      - {{ mod }}
-    {% endfor %}
-  {% endfor %}
-{% elif 'mine_functions' in cfg_salt %}
-mine_functions:
-  {% for name, roots in cfg_salt['mine_functions'].items() %}
-  {{ name }}:
-    {% for mod in roots %}
-      - {{ mod }}
-    {% endfor %}
-  {% endfor %}
-{% endif %}
 
 
 #####         Logging settings       #####