From a45f203750a485e00ab56d3997c4a13e8704da89 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 9 Sep 2020 10:47:36 -0700
Subject: [PATCH] pkgs01.stg: add instance to staging

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../pkgs01.stg.iad2.fedoraproject.org         | 19 +++++++++++++++
 .../pkgs01.stg.phx2.fedoraproject.org         | 23 -------------------
 inventory/inventory                           |  4 ++--
 playbooks/groups/pkgs.yml                     |  3 ++-
 4 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org
 delete mode 100644 inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org

diff --git a/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org b/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..e1b7d5ec83
--- /dev/null
+++ b/inventory/host_vars/pkgs01.stg.iad2.fedoraproject.org
@@ -0,0 +1,19 @@
+---
+eth0_ip: 10.3.167.74
+nm: 255.255.255.0
+gw: 10.3.167.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
+vmhost: vmhost-x86-03.stg.iad2.fedoraproject.org
+datacenter: iad2
+
+ssh_hostnames:
+- pkgs.stg.fedoraproject.org
+
+# temp fix to get htis box working
+baseiptables: False
+
+# DB used by pagure
+pagure_db_host: db01.stg.phx2.fedoraproject.org
diff --git a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org b/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org
deleted file mode 100644
index 4e70c0146f..0000000000
--- a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,23 +0,0 @@
----
-eth0_ip: 10.5.128.175
-eth1_ip: 10.5.127.124
-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-8
-ks_repo: http://10.5.126.23/repo/rhel/RHEL8-x86_64/
-volgroup: /dev/vg_virthost16
-vmhost: virthost05.stg.phx2.fedoraproject.org
-datacenter: phx2
-
-ssh_hostnames:
-- pkgs.stg.fedoraproject.org
-
-# Need a eth0/eth1 install here.
-virt_install_command: "{{ virt_install_command_two_nic }}"
-
-# temp fix to get htis box working
-baseiptables: False
-
-# DB used by pagure
-pagure_db_host: db01.stg.phx2.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index da119f7116..c1dcec466c 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -478,7 +478,7 @@ openqa-x86-worker01.iad2.fedoraproject.org
 pkgs01.iad2.fedoraproject.org
 
 [pkgs_stg]
-# pkgs01.stg.iad2.fedoraproject.org
+pkgs01.stg.iad2.fedoraproject.org
 
 [proxies_external]
 proxy01.iad2.fedoraproject.org
@@ -636,7 +636,7 @@ os-node05.stg.iad2.fedoraproject.org
 # osbs-aarch64-node02.stg.iad2.fedoraproject.org
 # packages03.stg.iad2.fedoraproject.org
 # pdc-web01.stg.iad2.fedoraproject.org
-# pkgs01.stg.iad2.fedoraproject.org
+pkgs01.stg.iad2.fedoraproject.org
 proxy01.stg.iad2.fedoraproject.org
 proxy02.stg.iad2.fedoraproject.org
 rabbitmq01.stg.iad2.fedoraproject.org
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 392709b42d..34ea5f5dbf 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -15,7 +15,7 @@
   - hosts
   - rkhunter
   - nagios_client
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - sudo
   - apache
@@ -31,6 +31,7 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"