From c080cf37d6cf7043fef0ed93764a7b0694ba0949 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Fri, 23 Aug 2013 12:01:36 -0500
Subject: [PATCH] ext_pillar fix

---
 salt/files/master | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/salt/files/master b/salt/files/master
index 06adb97..578dc04 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -403,6 +403,7 @@ gitfs_remotes:
   - {{ remote }}{% endfor -%}
 {%- endif %}
 
+
 #####         Pillar settings        #####
 ##########################################
 # Salt Pillars allow for the building of global data that can be made selectively
@@ -437,7 +438,7 @@ ext_pillar:
 {% for name, args in master['ext_pillar'].items() -%}
   - {{ name }}: {{ args }}
 {% endfor -%}
-{% elif 'pillar_roots' in salt -%}
+{% elif 'ext_pillar' in salt -%}
 ext_pillar:
 {% for name, args in salt['ext_pillar'].items() -%}
   - {{ name }}: {{ args }}