From ec13777bd8b53002ca6b11adb033c9c5a2c416c3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Nov 2015 18:09:29 +0000 Subject: [PATCH] Looking at this, the only python34-fedmsg hosts are rhel7 so won't have dnf. --- roles/fedmsg/base/tasks/main.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index fba3d7d0db..4cc1271c38 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -15,12 +15,12 @@ - name: install python2 fedmsg package yum: pkg=fedmsg state=present - when: python34-fedmsg not in group_names and ansible_distribution_major_version|int < 22 + when: "'python34-fedmsg' in group_names" tags: fedmsg/base - name: install the python34 fedmsg package yum: pkg=python34-fedmsg-core state=present - when: python34-fedmsg in group_names and ansible_distribution_major_version|int < 22 + when: "'python34-fedmsg' in group_names" tags: fedmsg/base - name: install needed packages @@ -34,16 +34,6 @@ - fedmsg/base when: ansible_distribution_major_version|int > 21 -- name: install python2 fedmsg package - dnf: pkg=fedmsg state=present - when: python34-fedmsg not in group_names and ansible_distribution_major_version|int > 21 - tags: fedmsg/base - -- name: install the python34 fedmsg package - dnf: pkg=python34-fedmsg-core state=present - when: python34-fedmsg in group_names and ansible_distribution_major_version|int > 21 - 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