From 8cc4c30647d4e24c54a6a73e0e20566de7f533a1 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 10 Jan 2014 18:56:25 +0000
Subject: [PATCH] Add db-datanommer01, clean up postgres playbooks to be
 generic and not koji specific.

---
 inventory/group_vars/db-datanommer            |  9 +++++++
 .../db-datanommer01.phx2.fedoraproject.org    | 10 ++++++++
 inventory/inventory                           |  1 +
 playbooks/groups/postgresl-server.yml         | 24 +++++--------------
 roles/postgresql_server/tasks/main.yml        | 21 ----------------
 5 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100644 inventory/group_vars/db-datanommer
 create mode 100644 inventory/host_vars/db-datanommer01.phx2.fedoraproject.org

diff --git a/inventory/group_vars/db-datanommer b/inventory/group_vars/db-datanommer
new file mode 100644
index 0000000000..c21e64560d
--- /dev/null
+++ b/inventory/group_vars/db-datanommer
@@ -0,0 +1,9 @@
+---
+# Define resources for this group of hosts here. 
+lvm_size: 300000
+mem_size: 8192
+num_cpus: 2
+
+tcp_ports: [ 5432, 443 ]
+
+fas_client_groups: sysadmin-dba,sysadmin-noc
diff --git a/inventory/host_vars/db-datanommer01.phx2.fedoraproject.org b/inventory/host_vars/db-datanommer01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..1dc61380d7
--- /dev/null
+++ b/inventory/host_vars/db-datanommer01.phx2.fedoraproject.org
@@ -0,0 +1,10 @@
+---
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
+ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
+volgroup: /dev/vg_guests00
+eth0_ip: 10.5.126.109
+vmhost: virthost14.phx2.fedoraproject.org
+datacenter: phx2
diff --git a/inventory/inventory b/inventory/inventory
index 227e4ac634..e74db42248 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -175,6 +175,7 @@ db01.phx2.fedoraproject.org
 db04.phx2.fedoraproject.org
 db05.phx2.fedoraproject.org
 db-fas01.phx2.fedoraproject.org
+db-datanommer01.phx2.fedoraproject.org
 
 [dbserver-stg]
 db-fas01.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml
index 95ceec4b06..371a1453e9 100644
--- a/playbooks/groups/postgresl-server.yml
+++ b/playbooks/groups/postgresl-server.yml
@@ -2,10 +2,11 @@
 # NOTE: should be used with --limit most of the time
 # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars
 
-- name: make postgresql-server
-  hosts: dbserver-secondary
+- name: make postgresql-server instance
+  hosts: db-datanommer01.phx2.fedoraproject.org
   user: root
   gather_facts: False
+  accelerate: true
 
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
@@ -20,10 +21,11 @@
 
 # Once the instance exists, configure it. 
 
-- name: make db server system
-  hosts: dbserver-secondary
+- name: configure postgresql server system
+  hosts: db-datanommer01.phx2.fedoraproject.org
   user: root
   gather_facts: True
+  accelerate: true
 
   vars_files: 
    - /srv/web/infra/ansible/vars/global.yml
@@ -46,20 +48,6 @@
   - include: "{{ tasks }}/sudo.yml"
   - include: "{{ tasks }}/collectd/client.yml"
 
-- name: make koji db
-  hosts: dbserver-secondary
-  gather_facts: no
-  sudo: yes
-  sudo_user: postgres
-
-  vars_files: 
-   - /srv/web/infra/ansible/vars/global.yml
-   - "{{ private }}/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - /srv/web/infra/ansible/roles/koji_db
-
 # TODO: add iscsi task
 
   handlers:
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index 0c47c5535a..5688edd0e1 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -12,27 +12,6 @@
   tags:
   - packages
 
-- name: install koji package on koji db servers for schema
-  yum: name=koji state=installed
-  tags:
-  - packages
-  when: is_kojidb == "True"
-
-- name: initialize postgresql
-  command: service postgresql initdb
-           creates=/var/lib/pgsql/data/postgresql.conf
-  ignore_errors: true
-  tags:
-  - service
-
-- name: setup postgresql koji config file
-  template: src=pg_hba.conf.j2 dest=/var/lib/pgsql/data/pg_hba.conf mode=600 backup=yes
-  notify:
-  - restart postgresql
-  tags:
-  - config
-  when: is_kojidb == "True"
-
 - name: Set postgresql-server to run on boot
   service: name=postgresql enabled=yes
   ignore_errors: true