From fda0aa993b406f13ef4ea2ca15d5c26fcd4610f2 Mon Sep 17 00:00:00 2001
From: Leonel Galan <leonelgalan@gmail.com>
Date: Wed, 28 Jan 2015 15:03:41 -0500
Subject: [PATCH] Merges user privilages into correct role

---
 tasks/users.yml            | 15 ---------------
 tasks/users_privileges.yml |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/tasks/users.yml b/tasks/users.yml
index 3138fd4d..07a321e1 100644
--- a/tasks/users.yml
+++ b/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
-
diff --git a/tasks/users_privileges.yml b/tasks/users_privileges.yml
index 56b377c3..5b7ea492 100644
--- a/tasks/users_privileges.yml
+++ b/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