From 115272477af3a74e129e9162f5f70859e364e8e0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 11 Jun 2014 16:17:00 +0000
Subject: [PATCH] Nuke duplicate fedmsg setup in releng_config task, move to
 using fedmsg/base role.

---
 inventory/group_vars/releng  |  9 ++++++
 playbooks/groups/releng.yml  |  1 +
 tasks/koji/releng_config.yml | 59 ------------------------------------
 3 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng
index 863d42de54..ed8e777e24 100644
--- a/inventory/group_vars/releng
+++ b/inventory/group_vars/releng
@@ -20,3 +20,12 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: releng
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: sysadmin
+- service: bodhi
+  owner: root
+  group: masher
diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml
index 1172d6e77c..77516725af 100644
--- a/playbooks/groups/releng.yml
+++ b/playbooks/groups/releng.yml
@@ -37,6 +37,7 @@
   - base
   - nagios_client
   - collectd/base
+  - fedmsg/base
 
   tasks:
   - include: "{{ tasks }}/koji/releng_config.yml"
diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml
index 3962296bcb..4fbd1915c4 100644
--- a/tasks/koji/releng_config.yml
+++ b/tasks/koji/releng_config.yml
@@ -163,62 +163,3 @@
   action: copy src="{{ private }}/files/sudo/ftpsync-sudo" dest=/etc/sudoers.d/ftpsync mode=0440
   tags:
   - configs
-
-# fedmsg message buss stuff. 
-- name: fedmsg install
-  action: yum  state=installed pkg={{ item }}
-  with_items:
-    - fedmsg
-    # needed for now, until moksha 0.8.8-4 pulls it in.
-    - python-bunch
-  tags:
-  - fedmsg
-- name: fedmsg.d dir
-  action: file state=directory path=/etc/fedmsg.d mode=755 owner=root group=root
-  tags:
-  - fedmsg
-- name: fedmsg cert dir
-  action: file state=directory path=/etc/pki/fedmsg mode=755 owner=root group=root
-  tags:
-  - fedmsg
-- name: fedmsg files
-  action: copy src="{{ files }}/releng/fedmsg/{{ item }}" dest="/etc/fedmsg.d/{{ item }}" mode=644
-  with_items:
-    - ircbot.py
-    - ssl.py
-    - endpoints.py
-    - base.py
-  tags:
-  - fedmsg
-- name: fedmsg ca
-  action: copy src="{{ private }}/files/fedmsg-certs/keys/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=644
-  with_items:
-    - ca.crt
-- name: fedmsg cert
-  action: copy src="{{ private }}/files/fedmsg-certs/keys/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=644
-  with_items:
-    - bodhi-releng01.phx2.fedoraproject.org.crt
-  tags:
-  - fedmsg
-  when: inventory_hostname.startswith('releng01')
-- name: fedmsg key
-  action: copy src="{{ private }}/files/fedmsg-certs/keys/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=640 group=masher
-  with_items:
-    - bodhi-releng01.phx2.fedoraproject.org.key
-  tags:
-  - fedmsg
-  when: inventory_hostname.startswith('releng01')
-- name: fedmsg cert
-  action: copy src="{{ private }}/files/fedmsg-certs/keys/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=644
-  with_items:
-    - bodhi-releng02.phx2.fedoraproject.org.crt
-  tags:
-  - fedmsg
-  when: inventory_hostname.startswith('releng02')
-- name: fedmsg key
-  action: copy src="{{ private }}/files/fedmsg-certs/keys/{{ item }}" dest="/etc/pki/fedmsg/{{ item }}" mode=640 group=masher
-  with_items:
-    - bodhi-releng02.phx2.fedoraproject.org.key
-  tags:
-  - fedmsg
-  when: inventory_hostname.startswith('releng02')