From f97176b6e35cc4da73a1b5629ddd5006b8e2f05f Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Mon, 5 Oct 2015 14:48:47 +0000
Subject: [PATCH] fix additional package directive in buildmaster to work on <=
 f21

---
 roles/taskotron/buildmaster/tasks/main.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index 8062fc9cfe..a3870f5f76 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -17,9 +17,15 @@
     - python-psycopg2
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
-- name: ensure packages required for buildmaster are installed
-  action: dnf name={{ item }} state=latest
-  when: deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg'
+- name: ensure additional packages required for CI buildmaster are installed
+  yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
+  when: ansible_distribution_majorVersion|int < 22 and (deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg')
+  with_items:
+    - python-novaclient
+
+- name: ensure additional packages required for CI buildmaster are installed
+  dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
+  when: ansible_distribution_majorVersion|int > 21 and (deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg')
   with_items:
     - python-novaclient