From 9e1a3cc42c4aa116e9ca5f1274a4032d6bd748c9 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 16 Sep 2020 12:16:54 -0700
Subject: [PATCH] Add memcached01.stg

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 inventory/group_vars/memcached_stg                   |  2 +-
 .../host_vars/memcached01.stg.iad2.fedoraproject.org | 12 ++++++++++++
 .../host_vars/memcached01.stg.phx2.fedoraproject.org | 12 ------------
 inventory/inventory                                  |  4 ++--
 playbooks/groups/memcached.yml                       |  3 ++-
 5 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 inventory/host_vars/memcached01.stg.iad2.fedoraproject.org
 delete mode 100644 inventory/host_vars/memcached01.stg.phx2.fedoraproject.org

diff --git a/inventory/group_vars/memcached_stg b/inventory/group_vars/memcached_stg
index 21f862ff0d..7874afb098 100644
--- a/inventory/group_vars/memcached_stg
+++ b/inventory/group_vars/memcached_stg
@@ -1,7 +1,7 @@
 ---
 # Define resources for this group of hosts here. 
 lvm_size: 10000
-mem_size: 3072
+mem_size: 4096
 num_cpus: 1
 
 # for systems that do not match the above - specify the same parameter in
diff --git a/inventory/host_vars/memcached01.stg.iad2.fedoraproject.org b/inventory/host_vars/memcached01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..179dc3e9cd
--- /dev/null
+++ b/inventory/host_vars/memcached01.stg.iad2.fedoraproject.org
@@ -0,0 +1,12 @@
+---
+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
+vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org
+datacenter: iad2
+
+eth0_ip: 10.3.166.41
diff --git a/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org b/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org
deleted file mode 100644
index e1d81eb8bd..0000000000
--- a/inventory/host_vars/memcached01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,12 +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
-vmhost: virthost03.stg.phx2.fedoraproject.org
-datacenter: phx2
-
-eth0_ip: 10.5.128.148
diff --git a/inventory/inventory b/inventory/inventory
index 566d0f9f1c..e7173ccd57 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -328,7 +328,7 @@ nuancier02.iad2.fedoraproject.org
 memcached01.iad2.fedoraproject.org
 
 [memcached_stg]
-# memcached01.stg.iad2.fedoraproject.org
+memcached01.stg.iad2.fedoraproject.org
 
 [mirrorlist_proxies]
 proxy01.iad2.fedoraproject.org
@@ -602,7 +602,7 @@ koji01.stg.iad2.fedoraproject.org
 # mailman01.stg.iad2.fedoraproject.org
 mbs-backend01.stg.iad2.fedoraproject.org
 mbs-frontend01.stg.iad2.fedoraproject.org
-# memcached01.stg.iad2.fedoraproject.org
+memcached01.stg.iad2.fedoraproject.org
 # mm-backend01.stg.iad2.fedoraproject.org
 # mm-crawler01.stg.iad2.fedoraproject.org
 # mm-frontend01.stg.iad2.fedoraproject.org
diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml
index e59989b27c..be9b37c987 100644
--- a/playbooks/groups/memcached.yml
+++ b/playbooks/groups/memcached.yml
@@ -15,7 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - collectd/memcached
   - sudo
@@ -26,6 +26,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: