Add db01.stg and sundries01.stg

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

inventory/host_vars/db01.stg.iad2.fedoraproject.org

@@ -1,13 +1,13 @@
 ---
 nm: 255.255.255.0
-gw: 10.5.128.254
-dns: 10.5.126.21
-eth0_ip: 10.5.128.120
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_virthost16
-vmhost: virthost05.stg.phx2.fedoraproject.org
-datacenter: phx2
+gw: 10.3.166.254
+dns: 10.3.163.33
+eth0_ip: 10.3.166.32
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+vmhost: vmhost-x86-01.stg.iad2.fedoraproject.org
+datacenter: iad2
 
 # This is a generic list, monitored by collectd
 databases:

inventory/host_vars/sundries01.stg.iad2.fedoraproject.org

@@ -0,0 +1,14 @@
+---
+nm: 255.255.255.0
+gw: 10.3.166.254
+dns: 10.3.163.33
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.33
+vmhost: vmhost-x86-02.stg.iad2.fedoraproject.org
+datacenter: iad2
+# This overrides a group var and lets the playbook know that we should
+# install special cron jobs here.
+master_sundries_node: True
+mirrorlist_procs: 45

inventory/host_vars/sundries01.stg.phx2.fedoraproject.org

@@ -1,14 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.128.254
-dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.185
-vmhost: virthost03.stg.phx2.fedoraproject.org
-datacenter: phx2
-# This overrides a group var and lets the playbook know that we should
-# install special cron jobs here.
-master_sundries_node: True
-mirrorlist_procs: 45

inventory/inventory

@@ -203,7 +203,7 @@ db-openqa01.iad2.fedoraproject.org
 
 [dbserver_stg]
 # db-fas01.stg.iad2.fedoraproject.org
-# db01.stg.iad2.fedoraproject.org
+db01.stg.iad2.fedoraproject.org
 # db03.stg.iad2.fedoraproject.org
 db-koji01.stg.iad2.fedoraproject.org
 
@@ -589,7 +589,7 @@ copr-keygen-dev.aws.fedoraproject.org
 # datagrepper01.stg.iad2.fedoraproject.org
 # db-fas01.stg.iad2.fedoraproject.org
 db-koji01.stg.iad2.fedoraproject.org
-# db01.stg.iad2.fedoraproject.org
+db01.stg.iad2.fedoraproject.org
 # db03.stg.iad2.fedoraproject.org
 # oci-candidate-registry01.stg.iad2.fedoraproject.org
 # oci-registry01.stg.iad2.fedoraproject.org

playbooks/groups/sundries.yml

@@ -20,7 +20,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - mod_wsgi
   - geoip
@@ -79,6 +79,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
   - import_tasks: "{{ tasks_path }}/reg-server.yml"