summaryrefslogtreecommitdiffstats
path: root/roles/taskotron/buildmaster
diff options
context:
space:
mode:
authorTim Flink <tflink@fedoraproject.org>2015-10-05 14:48:47 +0000
committerTim Flink <tflink@fedoraproject.org>2015-10-05 14:48:47 +0000
commitf97176b6e35cc4da73a1b5629ddd5006b8e2f05f (patch)
treecef73b7e91e9ede0c100e8100bac9f2f37c74abb /roles/taskotron/buildmaster
parentf081a1cf725dd2e580d20477c3eea1b64b98ac7b (diff)
downloadansible-f97176b6e35cc4da73a1b5629ddd5006b8e2f05f.tar.gz
ansible-f97176b6e35cc4da73a1b5629ddd5006b8e2f05f.tar.xz
ansible-f97176b6e35cc4da73a1b5629ddd5006b8e2f05f.zip
fix additional package directive in buildmaster to work on <= f21
Diffstat (limited to 'roles/taskotron/buildmaster')
-rw-r--r--roles/taskotron/buildmaster/tasks/main.yml12
1 files changed, 9 insertions, 3 deletions
diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index 8062fc9cf..a3870f5f7 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