From 0abb588b081d0c8e5a77ed5bf04f75715f1bcf33 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 17 May 2018 19:36:58 +0000
Subject: [PATCH] drop fas3-stg

---
 inventory/inventory                           |  4 --
 playbooks/groups/fas3.yml                     | 38 -------------------
 roles/haproxy/templates/haproxy.cfg           | 15 --------
 .../templates/nagios/hostgroups/nomail.cfg.j2 |  2 +-
 4 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 playbooks/groups/fas3.yml

diff --git a/inventory/inventory b/inventory/inventory
index 05ead944cf..8c1fc6b92d 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -353,9 +353,6 @@ fas03.phx2.fedoraproject.org
 [fas-stg]
 fas01.stg.phx2.fedoraproject.org
 
-[fas3-stg]
-fas3-01.stg.phx2.fedoraproject.org
-
 [hotness]
 hotness01.phx2.fedoraproject.org
 
@@ -741,7 +738,6 @@ db-fas01.stg.phx2.fedoraproject.org
 db-koji01.stg.phx2.fedoraproject.org
 elections01.stg.phx2.fedoraproject.org
 fas01.stg.phx2.fedoraproject.org
-fas3-01.stg.phx2.fedoraproject.org
 fedimg01.stg.phx2.fedoraproject.org
 fedocal01.stg.phx2.fedoraproject.org
 freshmaker-frontend01.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml
deleted file mode 100644
index f8604e25a3..0000000000
--- a/playbooks/groups/fas3.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# create a new fas server
-
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas3-stg"
-
-- name: make the box be real
-  hosts: fas3-stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - base
-  - hosts
-  - rkhunter
-  #- nagios_client
-  - fas_client
-  - collectd/base
-  - rsyncd
-  - memcached
-  - mod_wsgi
-  - fas3_server
-  - fedmsg/base
-  - sudo
-  #- yubikey
-  #- totpcgi
-  #- { role: openvpn/client, when: env != "staging" }
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg
index 4eec317d2d..4d2cc29fb6 100644
--- a/roles/haproxy/templates/haproxy.cfg
+++ b/roles/haproxy/templates/haproxy.cfg
@@ -425,21 +425,6 @@ backend pps-backend
     server  mdapi01 mdapi01:80 check inter 10s rise 1 fall 2
     option  httpchk GET /pps
 
-{% endif %}
-{% if env == "staging" %}
-
-frontend fas3-frontend
-    bind 0.0.0.0:10052
-    default_backend fas3-backend
-
-backend fas3-backend
-    # These values are set extremely low so any issues are recovered from very
-    # quickly.  Setting these higher will cause odd behavior in apps that
-    # depend on fas (like pkgdb, bodhi, etc)
-    balance hdr(appserver)
-    server  fas3-01.stg fas3-01.stg:80 check inter 5s rise 1 fall 2
-    option  httpchk GET /fas3/
-
 {% endif %}
 
 frontend ipa-frontend
diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
index de8ed6de91..872483c454 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  nomail
         alias           No Mail
-	members         *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
+	members         *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %}  {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} 
 
 }