Skip to content

Commit 95681aa

Browse files
authored
Merge pull request #130 from cisagov/improvement/support_running_on_cgroups_v2_hosts
Update the molecule systemd configuration for cgroups v2
2 parents e8ee074 + bdca810 commit 95681aa

File tree

1 file changed

+36
-24
lines changed

1 file changed

+36
-24
lines changed

molecule/default/molecule-with-systemd.yml

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,102 +15,114 @@ lint: |
1515
ansible-lint
1616
flake8
1717
platforms:
18-
- command: /lib/systemd/systemd
18+
- cgroupns_mode: host
19+
command: /lib/systemd/systemd
1920
image: geerlingguy/docker-amazonlinux2-ansible:latest
2021
name: amazonlinux2-systemd
2122
platform: amd64
2223
pre_build_image: yes
2324
privileged: yes
2425
volumes:
25-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
26-
- command: /lib/systemd/systemd
26+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
27+
- cgroupns_mode: host
28+
command: /lib/systemd/systemd
2729
image: geerlingguy/docker-debian9-ansible:latest
2830
name: debian9-systemd
2931
platform: amd64
3032
pre_build_image: yes
3133
privileged: yes
3234
volumes:
33-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
34-
- command: /lib/systemd/systemd
35+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
36+
- cgroupns_mode: host
37+
command: /lib/systemd/systemd
3538
image: geerlingguy/docker-debian10-ansible:latest
3639
name: debian10-systemd
3740
platform: amd64
3841
pre_build_image: yes
3942
privileged: yes
4043
volumes:
41-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
42-
- command: /lib/systemd/systemd
44+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
45+
- cgroupns_mode: host
46+
command: /lib/systemd/systemd
4347
image: geerlingguy/docker-debian11-ansible:latest
4448
name: debian11-systemd
4549
platform: amd64
4650
pre_build_image: yes
4751
privileged: yes
4852
volumes:
49-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
50-
- command: /lib/systemd/systemd
53+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
54+
- cgroupns_mode: host
55+
command: /lib/systemd/systemd
5156
image: cisagov/docker-debian12-ansible:latest
5257
name: debian12-systemd
5358
platform: amd64
5459
pre_build_image: yes
5560
privileged: yes
5661
volumes:
57-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
58-
- command: /lib/systemd/systemd
62+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
63+
- cgroupns_mode: host
64+
command: /lib/systemd/systemd
5965
image: cisagov/docker-kali-ansible:latest
6066
name: kali-systemd
6167
platform: amd64
6268
pre_build_image: yes
6369
privileged: yes
6470
volumes:
65-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
66-
- command: /lib/systemd/systemd
71+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
72+
- cgroupns_mode: host
73+
command: /lib/systemd/systemd
6774
image: geerlingguy/docker-fedora35-ansible:latest
6875
name: fedora35-systemd
6976
platform: amd64
7077
pre_build_image: yes
7178
privileged: yes
7279
volumes:
73-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
74-
- command: /lib/systemd/systemd
80+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
81+
- cgroupns_mode: host
82+
command: /lib/systemd/systemd
7583
image: geerlingguy/docker-fedora36-ansible:latest
7684
name: fedora36-systemd
7785
platform: amd64
7886
pre_build_image: yes
7987
privileged: yes
8088
volumes:
81-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
82-
- command: /lib/systemd/systemd
89+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
90+
- cgroupns_mode: host
91+
command: /lib/systemd/systemd
8392
image: geerlingguy/docker-fedora37-ansible:latest
8493
name: fedora37-systemd
8594
platform: amd64
8695
pre_build_image: yes
8796
privileged: yes
8897
volumes:
89-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
90-
- command: /lib/systemd/systemd
98+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
99+
- cgroupns_mode: host
100+
command: /lib/systemd/systemd
91101
image: geerlingguy/docker-ubuntu1804-ansible:latest
92102
name: ubuntu-18-systemd
93103
platform: amd64
94104
pre_build_image: yes
95105
privileged: yes
96106
volumes:
97-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
98-
- command: /lib/systemd/systemd
107+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
108+
- cgroupns_mode: host
109+
command: /lib/systemd/systemd
99110
image: geerlingguy/docker-ubuntu2004-ansible:latest
100111
name: ubuntu-20-systemd
101112
platform: amd64
102113
pre_build_image: yes
103114
privileged: yes
104115
volumes:
105-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
106-
- command: /lib/systemd/systemd
116+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
117+
- cgroupns_mode: host
118+
command: /lib/systemd/systemd
107119
image: geerlingguy/docker-ubuntu2204-ansible:latest
108120
name: ubuntu-22-systemd
109121
platform: amd64
110122
pre_build_image: yes
111123
privileged: yes
112124
volumes:
113-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
125+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
114126
provisioner:
115127
name: ansible
116128
inventory:

0 commit comments

Comments
 (0)