From cd8dd7bf145c4046f9137cc3c5cdbc3db9740f63 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Tue, 6 Mar 2012 12:38:44 -0700
Subject: [PATCH] Add pillar_roots to the config

---
 salt/config.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/salt/config.py b/salt/config.py
index 1a37b31791..6b7e366494 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -131,7 +131,10 @@ def minion_config(path):
             'file_client': 'remote',
             'file_roots': {
                 'base': ['/srv/salt'],
-            },
+                },
+            'pillar_roots': {
+                'base': ['/srv/pillar'],
+                }
             'hash_type': 'md5',
             'external_nodes': '',
             'disable_modules': [],
@@ -198,7 +201,10 @@ def master_config(path):
             'cachedir': '/var/cache/salt',
             'file_roots': {
                 'base': ['/srv/salt'],
-            },
+                },
+            'pillar_roots': {
+                'base': ['/srv/pillar'],
+                }
             'file_buffer_size': 1048576,
             'hash_type': 'md5',
             'conf_file': path,