From e166e2a45756e88ba8b6c5cb2f89191a0ab235c4 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Tue, 11 Nov 2014 22:27:03 +0000
Subject: [PATCH] Revert "attempting to isolate the postgresql commands for
 resultsdb backend"

This reverts commit d6fdac91bdc11f4dbed7d69b10a1fb0e624c69eb.
---
 .../resultsdb-backend/tasks/database.yml      | 22 -------------------
 .../resultsdb-backend/tasks/main.yml          | 21 +++++++++++++++++-
 2 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 roles/taskotron/resultsdb-backend/tasks/database.yml

diff --git a/roles/taskotron/resultsdb-backend/tasks/database.yml b/roles/taskotron/resultsdb-backend/tasks/database.yml
deleted file mode 100644
index 62505a1d52..0000000000
--- a/roles/taskotron/resultsdb-backend/tasks/database.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- name: prepare resultsdb database
-  hosts: "{{ resultsdb_db_host }}"
-  gather_facts: no
-  sudo: yes
-  sudo_user: postgres
-
-  tasks:
-    - name: ensure dev database is created
-      action: postgresql_db db={{ resultsdb_db_name }}
-
-    - name: ensure dev resultsdb db user has access to dev database
-      when: deployment_type == 'dev'
-      action: postgresql_user db={{ resultsdb_db_name }} user={{ dev_resultsdb_db_user }} password={{ dev_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
-
-    - name: ensure stg resultsdb db user has access to stg database
-      when: deployment_type == 'stg'
-      action: postgresql_user db={{ resultsdb_db_name }} user={{ stg_resultsdb_db_user }} password={{ stg_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
-
-    - name: ensure prod resultsdb db user has access to prod database
-      when: deployment_type == 'prod'
-      action: postgresql_user db={{ resultsdb_db_name }} user={{ prod_resultsdb_db_user }} password={{ prod_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
-
diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index abf7387045..d82ffb90ce 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -6,7 +6,26 @@
     - python-psycopg2
     - libsemanage-python
 
-- include: database.yml
+- name: prepare resultsdb database
+  hosts: "{{ resultsdb_db_host }}"
+  gather_facts: no
+  sudo: yes
+  sudo_user: postgres
+  tasks:
+    - name: ensure dev database is created
+      action: postgresql_db db={{ resultsdb_db_name }}
+
+    - name: ensure dev resultsdb db user has access to dev database
+      when: deployment_type == 'dev'
+      action: postgresql_user db={{ resultsdb_db_name }} user={{ dev_resultsdb_db_user }} password={{ dev_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
+
+    - name: ensure stg resultsdb db user has access to stg database
+      when: deployment_type == 'stg'
+      action: postgresql_user db={{ resultsdb_db_name }} user={{ stg_resultsdb_db_user }} password={{ stg_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
+
+    - name: ensure prod resultsdb db user has access to prod database
+      when: deployment_type == 'prod'
+      action: postgresql_user db={{ resultsdb_db_name }} user={{ prod_resultsdb_db_user }} password={{ prod_resultsdb_db_password }} role_attr_flags=NOSUPERUSER
 
 - name: ensure selinux lets httpd talk to postgres
   seboolean: name=httpd_can_network_connect_db persistent=yes state=yes