From 510337cb706a8aa8ff8762ca013e71b5f20716a3 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 9 Oct 2014 15:13:45 +0000
Subject: [PATCH] fedmsg for koschei.

---
 .../host_vars/koschei.cloud.fedoraproject.org    |  9 +++++++++
 .../hosts/koschei.cloud.fedoraproject.org.yml    | 16 ++++++++++++++++
 roles/fedmsg/base/templates/ssl.py.j2            |  4 ++++
 3 files changed, 29 insertions(+)

diff --git a/inventory/host_vars/koschei.cloud.fedoraproject.org b/inventory/host_vars/koschei.cloud.fedoraproject.org
index 75447eb56a..6f6b06baea 100644
--- a/inventory/host_vars/koschei.cloud.fedoraproject.org
+++ b/inventory/host_vars/koschei.cloud.fedoraproject.org
@@ -9,3 +9,12 @@ public_ip: 209.132.184.151
 root_auth_users: mizdebsk msimacek 
 description: Koschei - ticket 4449
 volumes: ['-d /dev/vdb vol-0000002c']
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: root
+- service: koschei
+  owner: root
+  group: koschei
diff --git a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
index 62ee25f279..1a54c9eb7f 100644
--- a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml
@@ -29,3 +29,19 @@
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
+
+- name: setup fedmsg
+  hosts: koschei.cloud.fedoraproject.org
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "{{ private }}/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+  - fedmsg/base
+
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index 2a55f4e1a8..b1ba439aa8 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -187,6 +187,10 @@ config = dict(
         # Jenkins, also being a cloud node, is weird.  Like copr.
         ("shell.jenkins-master-unknown", "shell-jenkins.cloud.fedoraproject.org"),
         ("jenkins.jenkins-master-unknown", "jenkins-jenkins.cloud.fedoraproject.org"),
+
+        # Koschei, also a cloud node, is the most weird.  Weirdest.
+        ("shell.server-3a4eddb8-c754-4f32-969b-3bf4751732b3", "shell-koschei.cloud.fedoraproject.org"),
+        ("koschei.server-3a4eddb8-c754-4f32-969b-3bf4751732b3", "koschei-koschei.cloud.fedoraproject.org"),
     ]),
 )