From d5ed2c02ecbc3f64bc0fdd082d457196ade58cb3 Mon Sep 17 00:00:00 2001
From: hogenj <john.hogenmiller@emc.com>
Date: Wed, 4 Mar 2015 16:13:42 -0500
Subject: [PATCH] Make template and organize pillar scope

---
 sudoers/init.sls                              |  8 +++----
 sudoers/map.jinja                             | 24 ++++++++++---------
 .../sudoers => templates/etc/sudoers.jinja}   |  0
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename sudoers/{files/sudoers => templates/etc/sudoers.jinja} (100%)

diff --git a/sudoers/init.sls b/sudoers/init.sls
index 922fdf7..88a8e07 100644
--- a/sudoers/init.sls
+++ b/sudoers/init.sls
@@ -2,15 +2,15 @@
 
 sudo:
   pkg.installed:
-    - name: {{ sudoers.pkg }}
+    - name: {{ sudoers.lookup.pkg }}
 
-{{ sudoers.get('config-path', '/etc') }}/sudoers:
+{{ sudoers.get('lookup:config-path', '/etc') }}/sudoers:
   file.managed:
     - user: root
-    - group: {{ sudoers.get('group', 'root') }}
+    - group: {{ sudoers.get('lookup:group', 'root') }}
     - mode: 440
     - template: jinja
-    - source: salt://sudoers/files/sudoers
+    - source: salt://sudoers/templates/etc/sudoers
     - context:
         included: False
     - require:
diff --git a/sudoers/map.jinja b/sudoers/map.jinja
index e0052c3..8ea5f95 100644
--- a/sudoers/map.jinja
+++ b/sudoers/map.jinja
@@ -1,14 +1,16 @@
 {% set sudoers = salt['grains.filter_by']({
-    'Debian':  {'pkg': 'sudo'},
-    'Ubuntu':  {'pkg': 'sudo'},
-    'CentOS':  {'pkg': 'sudo'},
-    'Fedora':  {'pkg': 'sudo'},
-    'RedHat':  {'pkg': 'sudo'},
-    'Amazon':  {'pkg': 'sudo'},
-    'Gentoo':  {'pkg': 'app-admin/sudo'},
-    'Mint':    {'pkg': 'sudo'},
-    'Arch':    {'pkg': 'sudo'},
-    'FreeBSD': {'pkg': 'sudo',
+
+    'Debian':  { 'lookup': {'pkg': 'sudo'}},
+    'Ubuntu':  { 'lookup': {'pkg': 'sudo'}},
+    'CentOS':  { 'lookup':{'pkg': 'sudo'}},
+    'Fedora':  { 'lookup':{'pkg': 'sudo'}},
+    'RedHat':  { 'lookup':{'pkg': 'sudo'}},
+    'Amazon':  { 'lookup':{'pkg': 'sudo'}},
+    'Gentoo':  { 'lookup':{'pkg': 'app-admin/sudo'}},
+    'Mint':    { 'lookup':{'pkg': 'sudo'}},
+    'Arch':    { 'lookup':{'pkg': 'sudo'}},
+    'FreeBSD': { 'lookup':{'pkg': 'sudo',
                 'config-path': '/usr/local/etc',
                 'group': 'wheel'},
-}, merge=salt['pillar.get']('sudoers:lookup')) %}
+               },
+}, merge=salt['pillar.get']('sudoers')) %}
diff --git a/sudoers/files/sudoers b/sudoers/templates/etc/sudoers.jinja
similarity index 100%
rename from sudoers/files/sudoers
rename to sudoers/templates/etc/sudoers.jinja