From 96774f04f5c448f79e09fe23394578510b45f2f9 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 11 Apr 2017 18:31:22 +0000
Subject: [PATCH] Good bye hosted03. A parting glass to your long service!

---
 inventory/group_vars/hosted                   | 29 -----------
 .../host_vars/hosted03.fedoraproject.org      |  4 --
 playbooks/fedorahosted_fedmsg_git.yml         | 52 -------------------
 roles/fedmsg/base/templates/ssl.py.j2         |  9 ----
 4 files changed, 94 deletions(-)
 delete mode 100644 inventory/group_vars/hosted
 delete mode 100644 inventory/host_vars/hosted03.fedoraproject.org
 delete mode 100644 playbooks/fedorahosted_fedmsg_git.yml

diff --git a/inventory/group_vars/hosted b/inventory/group_vars/hosted
deleted file mode 100644
index a17f94d4d0..0000000000
--- a/inventory/group_vars/hosted
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-# Even though the hosted nodes are still deployed with puppet, we have this
-# definition here so that the fedmsg authz policy can be generated correctly.
-# ... when we eventually fully ansibilize these hosts, just fill out the rest of
-# this file with the other vars we need.  --threebean
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: sysadmin
-  can_send:
-  - logger.log
-- service: trac
-  owner: root
-  group: apache
-  can_send:
-  - trac.ticket.delete
-  - trac.ticket.new
-  - trac.ticket.update
-  - trac.wiki.page.delete
-  - trac.wiki.page.new
-  - trac.wiki.page.rename
-  - trac.wiki.page.update
-  - trac.wiki.page.version.delete
-- service: git
-  owner: root
-  group: cla_done
-  can_send:
-  - trac.git.receive
diff --git a/inventory/host_vars/hosted03.fedoraproject.org b/inventory/host_vars/hosted03.fedoraproject.org
deleted file mode 100644
index ee50d4e919..0000000000
--- a/inventory/host_vars/hosted03.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-host_backup_targets: ['/srv']
-
-fedmsg_fqdn: hosted03.vpn.fedoraproject.org
diff --git a/playbooks/fedorahosted_fedmsg_git.yml b/playbooks/fedorahosted_fedmsg_git.yml
deleted file mode 100644
index fddaa55d34..0000000000
--- a/playbooks/fedorahosted_fedmsg_git.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# requires --extra-vars "{'repos': ['yokan.git', 'yumex.git']}"
-
-- name: Install the fedmsg hook into a number of fedorahosted git repos
-  hosts: hosted03.fedoraproject.org
-  user: root
-
-  vars:
-    prefix: /srv/git/
-    chained: /hooks/post-receive-chained.d
-    fedmsg_hook: /usr/local/share/git/hooks/post-receive-fedorahosted-fedmsg
-    chained_hook: /usr/share/git-core/post-receive-chained
-
-  tasks:
-  #  XXX - @puiterwijk - I did run that playbook recently. and it has just one
-  #  bug: if you don't have the email post-receive hook when you run it, you'll
-  #  need to make the symlink yourself, or you'll get bugged on every push :-)
-
-  # First -- a sanity check.  We want this to fail and stop the playbook if
-  # someone typoed and reponame.  The "command" here claims that it "creates" a
-  # file.  That is not actually true, but it tells ansible to not bother running
-  # the command *if* that creates= file is already present.  Its a hackaround to
-  # make this task idempotent.
-  - name: make sure the git repos exist in the first place
-    command: /bin/ls {{ prefix }}{{ item }} creates={{ prefix }}{{ item }}
-    with_items: "{{ repos }}"
-
-  - name: ensure there is a post-receive-chained.d/ directory
-    file: >
-        state=directory
-        path="{{ prefix }}{{ item }}{{ chained }}/"
-    with_items: "{{ repos }}"
-
-  - name: move the old post-receive email hook into the chained dir
-    command: >
-        /bin/mv "{{ prefix }}{{ item }}/hooks/post-receive" "{{ prefix }}{{ item }}{{ chained }}/post-receive-email"
-        removes="{{ prefix }}{{ item }}/hooks/post-receive"
-        creates="{{ prefix }}{{ item }}{{ chained }}/post-receive-email"
-    with_items: "{{ repos }}"
-
-  - name: symlink the fedmsg hook into the chained dir
-    file: >
-        path="{{ prefix }}{{ item }}{{ chained }}/post-receive-fedmsg"
-        src={{ fedmsg_hook }}
-        state=link
-    with_items: "{{ repos }}"
-
-  - name: symlink in the chained hook redirector
-    file: >
-        path="{{ prefix }}{{ item }}/hooks/post-receive"
-        src={{ chained_hook }}
-        state=link
-    with_items: "{{ repos }}"
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index e29b05860e..bbd338fdcd 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -18,15 +18,6 @@ config = dict(
     ("{{cert.get('alias', cert['service'])}}.{{inventory_hostname_short}}", "{{cert['service']}}-{{fedmsg_fqdn | default(inventory_hostname)}}"),
     {% endfor %}
 ] + [
-        # This is the beginning of the static list.  We should eventually remove
-        # this.
-        ("git.hosted03", "git-hosted03.vpn.fedoraproject.org"),
-        ("git.hosted04", "git-hosted04.vpn.fedoraproject.org"),
-        ("trac.hosted03", "trac-hosted03.vpn.fedoraproject.org"),
-        ("trac.hosted04", "trac-hosted04.vpn.fedoraproject.org"),
-        ("shell.hosted03", "shell-hosted03.vpn.fedoraproject.org"),
-        ("shell.hosted04", "shell-hosted04.vpn.fedoraproject.org"),
-    ] + [
         ("shell.anitya-frontend01", "shell-anitya-frontend01.vpn.fedoraproject.org"),
         ("anitya.anitya-frontend01", "anitya-anitya-frontend01.vpn.fedoraproject.org"),
         ("shell.anitya-backend01", "shell-anitya-backend01.vpn.fedoraproject.org"),