Merge pull request #62 from leonelgalan/master

Merges user privilages into correct role

Author: pjan

tasks/users.yml

@@ -16,18 +16,3 @@
   sudo_user: "{{postgresql_admin_user}}"
   with_items: postgresql_users
   when: postgresql_users|length > 0
-
-- name: PostgreSQL | Update the user privileges
-  postgresql_user:
-    name: "{{item.name}}"
-    db: "{{item.db}}"
-    port: "{{postgresql_port}}"
-    priv: "{{item.priv | default('ALL')}}"
-    state: present
-    login_user: "{{postgresql_admin_user}}"
-    role_attr_flags: "{{item.role_attr_flags | default('')}}"
-  sudo: yes
-  sudo_user: "{{postgresql_admin_user}}"
-  with_items: postgresql_user_privileges
-  when: postgresql_users|length > 0
-

tasks/users_privileges.yml

@@ -4,8 +4,13 @@
   postgresql_user:
     name: "{{item.name}}"
     db: "{{item.db}}"
+    port: "{{postgresql_port}}"
     priv: "{{item.priv | default('ALL')}}"
     state: present
     login_host: "{{item.host | default('localhost')}}"
+    login_user: "{{postgresql_admin_user}}"
+    role_attr_flags: "{{item.role_attr_flags | default('')}}"
+  sudo: yes
+  sudo_user: "{{postgresql_admin_user}}"
   with_items: postgresql_user_privileges
   when: postgresql_users|length > 0

test.yml

@@ -1,7 +1,8 @@
 - hosts: all
   vars_files:
-    - 'defaults/main.yml'
+    - defaults/main.yml
+    - vars/test.yml
   tasks:
-    - include: 'tasks/main.yml'
+    - include: tasks/main.yml
   handlers:
-    - include: 'handlers/main.yml'
+    - include: handlers/main.yml

vars/test.yml

@@ -0,0 +1,10 @@
+---
+blah: one
+postgresql_databases:
+  - name: foobar
+postgresql_users:
+  - name: baz
+    pass: pass
+postgresql_user_privileges:
+  - name: baz
+    db: foobar