From c85d3957195e50a28153380e925f402c924152e6 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <codeblock@fedoraproject.org>
Date: Mon, 21 Nov 2016 14:00:27 +0000
Subject: [PATCH] prepare modernpaste01.phx2

Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
---
 .../host_vars/modernpaste01.phx2.fedoraproject.org | 14 ++++++++++++++
 inventory/inventory                                |  3 +++
 playbooks/groups/modernpaste.yml                   | 10 +++++-----
 roles/modernpaste/templates/flask_config.py        |  5 +++++
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 inventory/host_vars/modernpaste01.phx2.fedoraproject.org

diff --git a/inventory/host_vars/modernpaste01.phx2.fedoraproject.org b/inventory/host_vars/modernpaste01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..bdc6464a05
--- /dev/null
+++ b/inventory/host_vars/modernpaste01.phx2.fedoraproject.org
@@ -0,0 +1,14 @@
+---
+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-fedora-24
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
+
+mem_size: 4096
+volgroup: /dev/vg_virthost03
+eth0_ip: 10.5.126.230
+vmhost: virthost03.phx2.fedoraproject.org
+datacenter: phx2
+tcp_ports: [22, 80, 443]
diff --git a/inventory/inventory b/inventory/inventory
index 71044d2cb5..5009dc9ac8 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -186,6 +186,9 @@ mdapi01.phx2.fedoraproject.org
 [mdapi-stg]
 mdapi01.stg.phx2.fedoraproject.org
 
+[modernpaste]
+modernpaste01.phx2.fedoraproject.org
+
 [modernpaste-stg]
 modernpaste01.stg.phx2.fedoraproject.org
 
diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml
index c25c9a4c0d..45c902d7e5 100644
--- a/playbooks/groups/modernpaste.yml
+++ b/playbooks/groups/modernpaste.yml
@@ -3,10 +3,10 @@
 # NOTE: make sure there is room/space for this server on the vmhost
 # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars
 
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg"
+- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste"
 
 - name: dole out the generic configuration
-  hosts: modernpaste-stg
+  hosts: modernpaste-stg:modernpaste
   user: root
   gather_facts: True
 
@@ -18,12 +18,12 @@
   roles:
   - base
   - rkhunter
-  #- nagios/client
+  - nagios/client
   - hosts
   - fas_client
   - sudo
   - collectd/base
-  #- fedmsg/base
+  - fedmsg/base
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
@@ -34,7 +34,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: dole out the service-specific config
-  hosts: modernpaste-stg
+  hosts: modernpaste-stg:modernpaste
   user: root
   gather_facts: True
 
diff --git a/roles/modernpaste/templates/flask_config.py b/roles/modernpaste/templates/flask_config.py
index 685b8fd496..6ae3833ec7 100644
--- a/roles/modernpaste/templates/flask_config.py
+++ b/roles/modernpaste/templates/flask_config.py
@@ -1,7 +1,12 @@
 import config
 import constants
 
+{% if env == 'staging' %}
 SQLALCHEMY_DATABASE_URI = 'postgres://{{modernpaste_stg_db_user}}:{{modernpaste_stg_db_password}}@db01/modernpaste'
+{% else %}
+SQLALCHEMY_DATABASE_URI = 'postgres://{{modernpaste_db_user}}:{{modernpaste_db_password}}@db01/modernpaste'
+{% endif %}
+
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 # Flask session secret key