Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openqa/relvalconsumer: fix all other dnf loop cases to use lists

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-10-09 13:50:39 -07:00
parent 5dea458a23
commit c69c2fd485
5 changed files with 34 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

37
roles/openqa/server/tasks/main.yml
View file

@ -68,36 +68,21 @@
# this is separate from the step below so we can easily flip it between
# stable and testing
- name: Install openQA packages
dnf: name={{ item }} state=present enablerepo="updates-testing"
with_items:
- openqa
- openqa-httpd
- openqa-plugin-fedmsg
- openqa-plugin-fedoraupdaterestart
- python2-fedfind
- python3-fedfind
dnf:
name: ['openqa', 'openqa-httpd', 'openqa-plugin-fedmsg', 'openqa-plugin-fedoraupdaterestart',
'python2-fedfind', 'python3-fedfind']
state: present
enablerepo: "updates-testing"
tags:
- packages
- name: Install various other required packages
dnf: name={{ item }} state=present
with_items:
- libselinux-python
- git
- json_diff
- libselinux-utils
- libsemanage-python
- nfs-utils
- perl(Class::DBI::Pg)
- perl(DateTime::Format::Pg)
- expect
- libguestfs-tools-c
- libguestfs-xfs
- libvirt-daemon-config-network
- libvirt-python3
- python3-libguestfs
- virt-install
- withlock
dnf:
name: ['libselinux-python', 'git', 'json_diff', 'libselinux-utils', 'libsemanage-python',
'nfs-utils', 'perl(Class::DBI::Pg)', 'expect', 'libguestfs-tools-c', 'libguestfs-xfs',
'libvirt-daemon-config-network', 'libvirt-python3', 'python3-libguestfs',
'virt-install', 'withlock']
state: present
tags:
- packages

14
roles/openqa/worker/tasks/createhdds.yml
View file

@ -2,16 +2,10 @@
# (none)
- name: Install required packages
dnf: name={{ item }} state=present
with_items:
- libsemanage-python
- libvirt-daemon-kvm
- libvirt-python3
- python3-libguestfs
- python3-fedfind
- qemu-kvm
- virt-install
- withlock
dnf:
name: ['libsemanage-python', 'libvirt-daemon-kvm', 'libvirt-python3', 'python3-libguestfs',
'python3-fedfind', 'qemu-kvm', 'virt-install', 'withlock']
state: present
tags:
- packages

14
roles/openqa/worker/tasks/main.yml
View file

@ -16,17 +16,17 @@
## installed and rngd.service enabled/started
- name: Install required packages (testing)
dnf: name={{ item }} state=present enablerepo="updates-testing"
with_items:
- openqa-worker
dnf:
name: ['openqa-worker']
state: present
enablerepo: "updates-testing"
tags:
- packages
- name: Install packages
dnf: name={{ item }} state=present
with_items:
- libselinux-python
- git
dnf:
name: ['libselinux-python', 'git']
state: present
tags:
- packages

7
roles/openqa/worker/tasks/tap-setup.yml
View file

@ -1,8 +1,7 @@
- name: Install packages
dnf: name={{ item }} state=present
with_items:
- os-autoinst-openvswitch
- tunctl
dnf:
name: ['os-autoinst-openvswitch', 'tunctl']
state: present
tags:
- packages

24
roles/relvalconsumer/tasks/main.yml
View file

@ -16,29 +16,23 @@
# note: kept around for when we need packages from u-t
#- name: Install required packages (testing)
# dnf: name={{ item }} state=present enablerepo="updates-testing"
# with_items:
# - python2-fedfind
# - python2-wikitcms
# dnf:
# name: ['python2-fedfind', 'python2-wikitcms']
# state: present
# enablerepo: "updates-testing"
# tags:
# - packages
- name: Install required packages
dnf: name={{ item }} state=present
with_items:
- python2-fedfind
- python2-wikitcms
- python2-fedmsg-consumers
- python2-mwclient
- python-setuptools
- relval
dnf:
name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg-consumers', 'python2-mwclient',
'python2-setuptools', 'relval']
state: present
tags:
- packages
- name: Install required packages (wiki oidc auth)
dnf: name={{ item }} state=present enablerepo="updates"
with_items:
- python2-openidc-client
dnf: name=python2-openidc-client state=present enablerepo="updates"
when: "wikitcms_token is defined"
tags:
- packages