From 84cb926f4e2408999d6965d9285153da260f0cf3 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 8 Feb 2016 18:38:32 +0000
Subject: Update master playbook, remove old taskotron-prod-clients.

---
 master.yml                                  |  6 ----
 playbooks/groups/taskotron-prod-clients.yml | 50 -----------------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 playbooks/groups/taskotron-prod-clients.yml

diff --git a/master.yml b/master.yml
index af85722a0..25474afbc 100644
--- a/master.yml
+++ b/master.yml
@@ -80,7 +80,6 @@
 - include: /srv/web/infra/ansible/playbooks/groups/openqa.yml
 - include: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
 - include: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml
-#- include: /srv/web/infra/ansible/playbooks/groups/osbs.yml
 - include: /srv/web/infra/ansible/playbooks/groups/packages.yml
 - include: /srv/web/infra/ansible/playbooks/groups/pagure.yml
 - include: /srv/web/infra/ansible/playbooks/groups/paste.yml
@@ -106,13 +105,8 @@
 - include: /srv/web/infra/ansible/playbooks/groups/tagger.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-prod.yml
-- include: /srv/web/infra/ansible/playbooks/groups/taskotron-prod-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-dev.yml
-# taskotron-dev-clients is being replaced with taskotron-client-hosts, can be removed soon. 2015-11-16 - tflink
-#- include: /srv/web/infra/ansible/playbooks/groups/taskotron-dev-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/taskotron-stg.yml
-# taskotron-stg-clients is being replaced with taskotron-client-hosts, will be removed soon. 2016-01-22 - tflink
-#- include: /srv/web/infra/ansible/playbooks/groups/taskotron-stg-clients.yml
 - include: /srv/web/infra/ansible/playbooks/groups/torrent.yml
 - include: /srv/web/infra/ansible/playbooks/groups/twisted-buildbots.yml
 - include: /srv/web/infra/ansible/playbooks/groups/unbound.yml
diff --git a/playbooks/groups/taskotron-prod-clients.yml b/playbooks/groups/taskotron-prod-clients.yml
deleted file mode 100644
index a8f842a46..000000000
--- a/playbooks/groups/taskotron-prod-clients.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-# create taskotron prod clients
-# 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=taskotron-prod-clients"
-
-- name: make the box be real
-  hosts: taskotron-prod-clients
-  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:
-   - { role: base, tags: ['base'] }
-   - { role: rkhunter, tags: ['rkhunter'] }
-   - { role: nagios_client, tags: ['nagios_client'] }
-   - { role: hosts, tags: ['hosts']}
-   - { role: fas_client, tags: ['fas_client'] }
-   - { role: collectd/base, tags: ['collectd_base'] }
-   - { role: sudo, tags: ['sudo'] }
-
-  tasks:
-  # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
-
-  handlers:
-   - include: "{{ handlers }}/restart_services.yml"
-
-- name: configure taskotron clients
-  hosts: taskotron-prod-clients
-  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:
-   - { role: taskotron/buildslave, tags: ['buildslave'] }
-   - { role: taskotron/taskotron-client, tags: ['taskotronclient'] }
-   - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] }
-
-- 
cgit