From d8f09def3daee1f4de03ec80c948ec17caca31f2 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 29 Jun 2015 19:11:53 +0000
Subject: [PATCH] Separate out python2 and python3 fedmsg hosts.

---
 inventory/inventory              |  5 +++++
 roles/fedmsg/base/tasks/main.yml | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/inventory/inventory b/inventory/inventory
index ca3e6f4bc2..9cb4027ace 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -750,6 +750,11 @@ fedmsg-relays-stg
 fedmsg-gateways-stg
 moksha-hubs-stg
 
+# These are groups that are using the python34 fedmsg stack.
+[python34-fedmsg:children]
+mailman
+mailman-stg
+
 ## END fedmsg services
 
 [cloud-hardware]
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index dc5c91c1cb..490ee4461b 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -5,7 +5,6 @@
 - name: install needed packages
   yum: pkg={{ item }} state=present
   with_items:
-  - fedmsg
   - libsemanage-python
   - python-psutil
   - policycoreutils-python  # This is in the kickstart now.  Here for old hosts.
@@ -13,6 +12,17 @@
   - packages
   - fedmsg/base
 
+- name: install python2 fedmsg package
+  yum: pkg=fedmsg state=present
+  when: 'python34-fedmsg' not in groups
+  tags: fedmsg/base
+
+- name: install the python34 fedmsg package
+  yum: pkg=python34-fedmsg-core state=present
+  when: 'python34-fedmsg' in groups
+  tags: fedmsg/base
+
+
 # We only need this on el6.  On el7, the fedmsg package uses systemd-tempfiles
 # to generate this effect for us.  Note that at the bottom of this role we add
 # the nrpe user to the fedmsg group so that it has *write* permissions to a unix