From e3a29bf69aa1af1c131b82fd88c2b6ee81d5f0d3 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Tue, 27 Aug 2013 10:33:06 -0500 Subject: [PATCH] ext_pillar fix --- salt/files/master | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/files/master b/salt/files/master index b0ea341..8461e50 100644 --- a/salt/files/master +++ b/salt/files/master @@ -436,12 +436,12 @@ pillar_roots: {% if 'ext_pillar' in master -%} ext_pillar: {% for pillar in master['ext_pillar'] %} - - {{ pillar.items()[0] }}: {{ pillar.items()[1] }} + - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }} {% endfor -%} {% elif 'ext_pillar' in salt -%} ext_pillar: {% for pillar in salt['ext_pillar'] %} - - {{ pillar.items()[0] }}: {{ pillar.items()[1] }} + - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }} {% endfor -%} {% else %} # ext_pillar: