remove lookup

pgbouncer/config.sls

@@ -7,23 +7,23 @@ include:
 {% if pgbouncer.users is defined %}
 pgbouncer_users:
   file.managed:
-    - name: {{ pgbouncer.lookup.users }}
-    - user: {{ pgbouncer.lookup.user }}
-    - group: {{ pgbouncer.lookup.group }}
+    - name: {{ pgbouncer.users }}
+    - user: {{ pgbouncer.user }}
+    - group: {{ pgbouncer.group }}
     - mode: 640
     - contents: |
       {%- for user, password in pgbouncer.users.items() %}
         "{{ user }}" "{{ password }}"
       {%- endfor %}
     - require:
-      - pkg: {{ pgbouncer.lookup.pkg }}
+      - pkg: {{ pgbouncer.pkg }}
     - require_in:
       - ini: pgbouncer_ini
 {% endif %}
 
 pgbouncer_ini:
   ini.options_present:
-    - name: {{ pgbouncer.lookup.config }}
+    - name: {{ pgbouncer.config }}
     - sections: 
         {{ pgbouncer.config|yaml }} 
     - require:

pgbouncer/install.sls

@@ -2,4 +2,4 @@
 
 pgbouncer_pkg:
   pkg.installed:
-    - name: {{ pgbouncer.lookup.pkg }}
+    - name: {{ pgbouncer.pkg }}

pgbouncer/os.yaml

 # vim: ts=2 sw=2
 
 FreeBSD:
-  lookup:
-    config: /usr/local/etc/pgbouncer.ini
-    users: /usr/local/etc/pgbouncer.users
-    pkg: pgbouncer
-    user: pgbouncer
-    group: pgbouncer
+  config: /usr/local/etc/pgbouncer.ini
+  users: /usr/local/etc/pgbouncer.users
+  pkg: pgbouncer
+  user: pgbouncer
+  group: pgbouncer
   config:
     pgbouncer:
       auth_file: /usr/local/etc/pgbouncer.users