Skip to content

Commit 09255f4

Browse files
Merge pull request #1090 from vojtechtrefny/master_ansible-install-fix
misc: Do not use "with_items" when installing packages
2 parents d9fde36 + 731f911 commit 09255f4

File tree

1 file changed

+131
-122
lines changed

1 file changed

+131
-122
lines changed

misc/libblockdev-tasks.yml

Lines changed: 131 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
---
55
####### Fedora
66
- name: Install basic build tools (Fedora)
7-
package: name={{item}} state=present
8-
with_items:
9-
- gcc
10-
- make
11-
- libtool
12-
- autoconf
13-
- automake
7+
package:
8+
state: present
9+
name:
10+
- gcc
11+
- make
12+
- libtool
13+
- autoconf
14+
- automake
1415
when: ansible_distribution == 'Fedora'
1516

1617
- name: Install dnf-plugins-core for dnf builddep (Fedora)
@@ -22,59 +23,62 @@
2223
when: ansible_distribution == 'Fedora'
2324

2425
- name: Install build dependencies not covered by dnf builddep (Fedora)
25-
package: name={{item}} state=present
26-
with_items:
27-
- libfdisk-devel
28-
- keyutils-libs-devel
29-
- libnvme-devel
30-
- e2fsprogs-devel
31-
- json-glib-devel
32-
- libatasmart-devel
33-
- libyaml-devel
26+
package:
27+
state: present
28+
name:
29+
- libfdisk-devel
30+
- keyutils-libs-devel
31+
- libnvme-devel
32+
- e2fsprogs-devel
33+
- json-glib-devel
34+
- libatasmart-devel
35+
- libyaml-devel
3436
when: ansible_distribution == 'Fedora'
3537

3638
- name: Install test dependencies (Fedora)
37-
package: name={{item}} state=present
38-
with_items:
39-
- btrfs-progs
40-
- cryptsetup
41-
- device-mapper-multipath
42-
- dosfstools
43-
- e2fsprogs
44-
- exfatprogs
45-
- f2fs-tools
46-
- glibc-all-langpacks
47-
- kernel-modules-extra
48-
- lvm2-dbusd
49-
- mdadm
50-
- ndctl
51-
- nilfs-utils
52-
- nss-tools
53-
- ntfsprogs
54-
- nvme-cli
55-
- nvmetcli
56-
- python3-bytesize
57-
- python3-dbus
58-
- python3-packaging
59-
- python3-pylint
60-
- python3-yaml
61-
- smartmontools
62-
- targetcli
63-
- udftools
64-
- vdo
65-
- volume_key
66-
- xfsprogs
39+
package:
40+
state: present
41+
name:
42+
- btrfs-progs
43+
- cryptsetup
44+
- device-mapper-multipath
45+
- dosfstools
46+
- e2fsprogs
47+
- exfatprogs
48+
- f2fs-tools
49+
- glibc-all-langpacks
50+
- kernel-modules-extra
51+
- lvm2-dbusd
52+
- mdadm
53+
- ndctl
54+
- nilfs-utils
55+
- nss-tools
56+
- ntfsprogs
57+
- nvme-cli
58+
- nvmetcli
59+
- python3-bytesize
60+
- python3-dbus
61+
- python3-packaging
62+
- python3-pylint
63+
- python3-yaml
64+
- smartmontools
65+
- targetcli
66+
- udftools
67+
- vdo
68+
- volume_key
69+
- xfsprogs
6770
when: ansible_distribution == 'Fedora' and test_dependencies|bool
6871

6972
####### CentOS
7073
- name: Install basic build tools (CentOS)
71-
package: name={{item}} state=present
72-
with_items:
73-
- gcc
74-
- make
75-
- libtool
76-
- autoconf
77-
- automake
74+
package:
75+
state: present
76+
name:
77+
- gcc
78+
- make
79+
- libtool
80+
- autoconf
81+
- automake
7882
when: ansible_distribution == 'CentOS'
7983

8084
- name: Install dnf-plugins-core for dnf builddep (CentOS)
@@ -86,40 +90,42 @@
8690
when: ansible_distribution == 'CentOS'
8791

8892
- name: Install build dependencies not covered by dnf builddep (CentOS)
89-
package: name={{item}} state=present
90-
with_items:
91-
- libfdisk-devel
92-
- keyutils-libs-devel
93-
- libnvme-devel
94-
- e2fsprogs-devel
95-
- json-glib-devel
96-
- libatasmart-devel
97-
- libyaml-devel
93+
package:
94+
state: present
95+
name:
96+
- libfdisk-devel
97+
- keyutils-libs-devel
98+
- libnvme-devel
99+
- e2fsprogs-devel
100+
- json-glib-devel
101+
- libatasmart-devel
102+
- libyaml-devel
98103
when: ansible_distribution == 'CentOS'
99104

100105
- name: Install test dependencies (CentOS)
101-
package: name={{item}} state=present
102-
with_items:
103-
- cryptsetup
104-
- device-mapper-multipath
105-
- dosfstools
106-
- e2fsprogs
107-
- glibc-all-langpacks
108-
- lvm2-dbusd
109-
- mdadm
110-
- ndctl
111-
- nss-tools
112-
- nvme-cli
113-
- nvmetcli
114-
- python3-bytesize
115-
- python3-dbus
116-
- python3-packaging
117-
- python3-yaml
118-
- smartmontools
119-
- targetcli
120-
- vdo
121-
- volume_key
122-
- xfsprogs
106+
package:
107+
state: present
108+
name:
109+
- cryptsetup
110+
- device-mapper-multipath
111+
- dosfstools
112+
- e2fsprogs
113+
- glibc-all-langpacks
114+
- lvm2-dbusd
115+
- mdadm
116+
- ndctl
117+
- nss-tools
118+
- nvme-cli
119+
- nvmetcli
120+
- python3-bytesize
121+
- python3-dbus
122+
- python3-packaging
123+
- python3-yaml
124+
- smartmontools
125+
- targetcli
126+
- vdo
127+
- volume_key
128+
- xfsprogs
123129
when: ansible_distribution == 'CentOS' and test_dependencies|bool
124130

125131
- name: Install pylint using pip (CentOS)
@@ -135,10 +141,11 @@
135141
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
136142

137143
- name: Install basic build tools (Debian/Ubuntu)
138-
package: name={{item}} state=present
139-
with_items:
140-
- gcc
141-
- make
144+
package:
145+
state: present
146+
name:
147+
- gcc
148+
- make
142149
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
143150

144151
- name: Add source repositories (Debian/Ubuntu)
@@ -161,43 +168,45 @@
161168
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
162169

163170
- name: Install build dependencies not covered by apt build-dep (Debian/Ubuntu)
164-
package: name={{item}} state=present
165-
with_items:
166-
- libfdisk-dev
167-
- libkeyutils-dev
168-
- libext2fs-dev
169-
- libjson-glib-dev
170-
- libatasmart-dev
171-
- libyaml-dev
171+
package:
172+
state: present
173+
name:
174+
- libfdisk-dev
175+
- libkeyutils-dev
176+
- libext2fs-dev
177+
- libjson-glib-dev
178+
- libatasmart-dev
179+
- libyaml-dev
172180
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
173181

174182
- name: Install test dependencies (Debian/Ubuntu)
175-
package: name={{item}} state=present
176-
with_items:
177-
- btrfs-progs
178-
- cryptsetup
179-
- dosfstools
180-
- e2fsprogs
181-
- exfatprogs
182-
- f2fs-tools
183-
- libnss3-tools
184-
- locales-all
185-
- lvm2-dbusd
186-
- mdadm
187-
- ndctl
188-
- nilfs-tools
189-
- ntfs-3g
190-
- pylint
191-
- python3-bytesize
192-
- python3-packaging
193-
- python3-pydbus
194-
- python3-yaml
195-
- smartmontools
196-
- targetcli-fb
197-
- udftools
198-
- vdo
199-
- volume-key
200-
- xfsprogs
183+
package:
184+
state: present
185+
name:
186+
- btrfs-progs
187+
- cryptsetup
188+
- dosfstools
189+
- e2fsprogs
190+
- exfatprogs
191+
- f2fs-tools
192+
- libnss3-tools
193+
- locales-all
194+
- lvm2-dbusd
195+
- mdadm
196+
- ndctl
197+
- nilfs-tools
198+
- ntfs-3g
199+
- pylint
200+
- python3-bytesize
201+
- python3-packaging
202+
- python3-pydbus
203+
- python3-yaml
204+
- smartmontools
205+
- targetcli-fb
206+
- udftools
207+
- vdo
208+
- volume-key
209+
- xfsprogs
201210
when: (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu') and test_dependencies|bool
202211

203212
####### Common actions

0 commit comments

Comments
 (0)