From 94ca15a1a202398b2c8d623430000947b5f07c1a Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Wed, 14 Sep 2016 17:53:21 +0000
Subject: [PATCH] Seems there was already a playbook, lets reuse

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 playbooks/groups/autosign.yml      | 11 +++++----
 playbooks/groups/robosignatory.yml | 37 ------------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 playbooks/groups/robosignatory.yml

diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml
index 4c4dd45b11..c89702a7ab 100644
--- a/playbooks/groups/autosign.yml
+++ b/playbooks/groups/autosign.yml
@@ -1,11 +1,11 @@
 # create a new autosign server
 #
-# This server looks for rawhide builds and requests they be signed.
-#
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign"
+# FURTHER NOTE: some of These machines run day to day with sshd disabled/off.
+# Access is via management interface only. This playbook does initial setup.
+# Please check with rel-eng before doing anything here.
 
 - name: make the box be real
-  hosts: autosign:autosign-hardware
+  hosts: autosign
   user: root
   gather_facts: True
 
@@ -21,8 +21,9 @@
   - hosts
   - fas_client
   - collectd/base
-  - autosigner
   - sudo
+  - fedmsg/hub
+  - robosignatory
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
diff --git a/playbooks/groups/robosignatory.yml b/playbooks/groups/robosignatory.yml
deleted file mode 100644
index cc3c32161b..0000000000
--- a/playbooks/groups/robosignatory.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# provision an autosign server
-# NOTE: this assumes the boxes are already up and are accessible
-# NOTE: most of these vars_path come from group_vars/sign or from hostvars
-#
-# FURTHER NOTE: some of These machines run day to day with sshd disabled/off.
-# Access is via management interface only. This playbook does initial setup.
-# Please check with rel-eng before doing anything here.
-
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge"
-
-- name: configure robosignatory server
-  hosts: autosign
-  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
-  - rkhunter
-  - hosts
-  - fas_client
-  - sudo
-  - fedmsg/base
-  - fedmsg/hub
-  - robosignatory
-
-  tasks:
-  - include: "{{ tasks }}/motd.yml"
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"