summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Bean <rbean@redhat.com>2015-06-29 19:11:53 +0000
committerRalph Bean <rbean@redhat.com>2015-06-29 19:11:53 +0000
commitd8f09def3daee1f4de03ec80c948ec17caca31f2 (patch)
treeb91a67d3f15d3f7e0462aba7a4e40b41a9406f8e
parent669210596c1d1280398d92dd52fb2eb431a2f987 (diff)
downloadansible-d8f09def3daee1f4de03ec80c948ec17caca31f2.tar.gz
ansible-d8f09def3daee1f4de03ec80c948ec17caca31f2.tar.xz
ansible-d8f09def3daee1f4de03ec80c948ec17caca31f2.zip
Separate out python2 and python3 fedmsg hosts.
-rw-r--r--inventory/inventory5
-rw-r--r--roles/fedmsg/base/tasks/main.yml12
2 files changed, 16 insertions, 1 deletions
diff --git a/inventory/inventory b/inventory/inventory
index ca3e6f4bc..9cb4027ac 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 dc5c91c1c..490ee4461 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