Revert "attempting to isolate the postgresql commands for resultsdb backend"

This reverts commit d6fdac91bd.

roles/taskotron/resultsdb-backend/tasks/database.yml

@@ -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
-

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