Skip to content

Commit e76dea4

Browse files
sjpbsjpb
committed
fix molecule-podman networking
1 parent 1372062 commit e76dea4

File tree

16 files changed

+54
-109
lines changed

16 files changed

+54
-109
lines changed

‎molecule/test1/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
- name: testohpc-compute-0
1918
image: ${MOLECULE_IMAGE}
2019
pre_build_image: true
@@ -26,8 +25,7 @@ platforms:
2625
- /tmp
2726
volumes:
2827
- /sys/fs/cgroup:/sys/fs/cgroup:ro
29-
networks:
30-
- name: net1
28+
network: net1
3129
- name: testohpc-compute-1
3230
image: ${MOLECULE_IMAGE}
3331
pre_build_image: true
@@ -39,8 +37,7 @@ platforms:
3937
- /tmp
4038
volumes:
4139
- /sys/fs/cgroup:/sys/fs/cgroup:ro
42-
networks:
43-
- name: net1
40+
network: net1
4441
provisioner:
4542
name: ansible
4643
verifier:

‎molecule/test10/molecule.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ platforms:
1414
- /tmp
1515
volumes:
1616
- /sys/fs/cgroup:/sys/fs/cgroup:ro
17-
networks:
18-
- name: net1
17+
network: net1
1918
- name: testohpc-compute-0
2019
image: ${MOLECULE_IMAGE}
2120
pre_build_image: true
@@ -28,8 +27,7 @@ platforms:
2827
- /tmp
2928
volumes:
3029
- /sys/fs/cgroup:/sys/fs/cgroup:ro
31-
networks:
32-
- name: net1
30+
network: net1
3331
- name: testohpc-compute-1
3432
image: ${MOLECULE_IMAGE}
3533
pre_build_image: true
@@ -42,8 +40,7 @@ platforms:
4240
- /tmp
4341
volumes:
4442
- /sys/fs/cgroup:/sys/fs/cgroup:ro
45-
networks:
46-
- name: net1
43+
network: net1
4744
- name: testohpc-compute-2
4845
image: ${MOLECULE_IMAGE}
4946
pre_build_image: true
@@ -55,8 +52,7 @@ platforms:
5552
- /tmp
5653
volumes:
5754
- /sys/fs/cgroup:/sys/fs/cgroup:ro
58-
networks:
59-
- name: net1
55+
network: net1
6056
provisioner:
6157
name: ansible
6258
verifier:

‎molecule/test11/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
- name: testohpc-compute-0
1918
image: ${MOLECULE_IMAGE}
2019
pre_build_image: true
@@ -28,8 +27,7 @@ platforms:
2827
- /tmp
2928
volumes:
3029
- /sys/fs/cgroup:/sys/fs/cgroup:ro
31-
networks:
32-
- name: net1
30+
network: net1
3331
- name: testohpc-compute-1
3432
image: ${MOLECULE_IMAGE}
3533
pre_build_image: true
@@ -42,8 +40,7 @@ platforms:
4240
- /tmp
4341
volumes:
4442
- /sys/fs/cgroup:/sys/fs/cgroup:ro
45-
networks:
46-
- name: net1
43+
network: net1
4744
provisioner:
4845
name: ansible
4946
verifier:

‎molecule/test12/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
docker_networks:
1918
- name: net1
2019
driver_options:
@@ -30,8 +29,7 @@ platforms:
3029
- /tmp
3130
volumes:
3231
- /sys/fs/cgroup:/sys/fs/cgroup:ro
33-
networks:
34-
- name: net1
32+
network: net1
3533
- name: testohpc-compute-1
3634
image: ${MOLECULE_IMAGE}
3735
pre_build_image: true
@@ -43,8 +41,7 @@ platforms:
4341
- /tmp
4442
volumes:
4543
- /sys/fs/cgroup:/sys/fs/cgroup:ro
46-
networks:
47-
- name: net1
44+
network: net1
4845
provisioner:
4946
name: ansible
5047
verifier:

‎molecule/test13/molecule.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817

1918
- name: testohpc-login-0
2019
image: ${MOLECULE_IMAGE}
@@ -27,8 +26,7 @@ platforms:
2726
- /tmp
2827
volumes:
2928
- /sys/fs/cgroup:/sys/fs/cgroup:ro
30-
networks:
31-
- name: net1
29+
network: net1
3230

3331
- name: testohpc-login-1
3432
image: ${MOLECULE_IMAGE}
@@ -41,8 +39,7 @@ platforms:
4139
- /tmp
4240
volumes:
4341
- /sys/fs/cgroup:/sys/fs/cgroup:ro
44-
networks:
45-
- name: net1
42+
network: net1
4643

4744
- name: testohpc-compute-0
4845
image: ${MOLECULE_IMAGE}
@@ -55,8 +52,7 @@ platforms:
5552
- /tmp
5653
volumes:
5754
- /sys/fs/cgroup:/sys/fs/cgroup:ro
58-
networks:
59-
- name: net1
55+
network: net1
6056
- name: testohpc-compute-1
6157
image: ${MOLECULE_IMAGE}
6258
pre_build_image: true
@@ -68,8 +64,7 @@ platforms:
6864
- /tmp
6965
volumes:
7066
- /sys/fs/cgroup:/sys/fs/cgroup:ro
71-
networks:
72-
- name: net1
67+
network: net1
7368
provisioner:
7469
name: ansible
7570
# ansible_args:

‎molecule/test14/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
docker_networks:
1918
- name: net1
2019
driver_options:
@@ -30,8 +29,7 @@ platforms:
3029
- /tmp
3130
volumes:
3231
- /sys/fs/cgroup:/sys/fs/cgroup:ro
33-
networks:
34-
- name: net1
32+
network: net1
3533
docker_networks:
3634
- name: net1
3735
driver_options:
@@ -47,8 +45,7 @@ platforms:
4745
- /tmp
4846
volumes:
4947
- /sys/fs/cgroup:/sys/fs/cgroup:ro
50-
networks:
51-
- name: net1
48+
network: net1
5249
docker_networks:
5350
- name: net1
5451
driver_options:

‎molecule/test1b/molecule.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ platforms:
1515
- /tmp
1616
volumes:
1717
- /sys/fs/cgroup:/sys/fs/cgroup:ro
18-
networks:
19-
- name: net1
18+
network: net1
2019
- name: testohpc-compute-0
2120
image: ${MOLECULE_IMAGE}
2221
pre_build_image: true
@@ -28,8 +27,7 @@ platforms:
2827
- /tmp
2928
volumes:
3029
- /sys/fs/cgroup:/sys/fs/cgroup:ro
31-
networks:
32-
- name: net1
30+
network: net1
3331
provisioner:
3432
name: ansible
3533
verifier:

‎molecule/test1c/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
- name: compute-a
1918
image: ${MOLECULE_IMAGE}
2019
pre_build_image: true
@@ -26,8 +25,7 @@ platforms:
2625
- /tmp
2726
volumes:
2827
- /sys/fs/cgroup:/sys/fs/cgroup:ro
29-
networks:
30-
- name: net1
28+
network: net1
3129
- name: compute10
3230
image: ${MOLECULE_IMAGE}
3331
pre_build_image: true
@@ -39,8 +37,7 @@ platforms:
3937
- /tmp
4038
volumes:
4139
- /sys/fs/cgroup:/sys/fs/cgroup:ro
42-
networks:
43-
- name: net1
40+
network: net1
4441
provisioner:
4542
name: ansible
4643
verifier:

‎molecule/test2/molecule.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
- name: testohpc-part1-0
1918
image: ${MOLECULE_IMAGE}
2019
pre_build_image: true
@@ -27,8 +26,7 @@ platforms:
2726
- /tmp
2827
volumes:
2928
- /sys/fs/cgroup:/sys/fs/cgroup:ro
30-
networks:
31-
- name: net1
29+
network: net1
3230
- name: testohpc-part1-1
3331
image: ${MOLECULE_IMAGE}
3432
pre_build_image: true
@@ -41,8 +39,7 @@ platforms:
4139
- /tmp
4240
volumes:
4341
- /sys/fs/cgroup:/sys/fs/cgroup:ro
44-
networks:
45-
- name: net1
42+
network: net1
4643
- name: testohpc-part2-0
4744
image: ${MOLECULE_IMAGE}
4845
pre_build_image: true
@@ -55,8 +52,7 @@ platforms:
5552
- /tmp
5653
volumes:
5754
- /sys/fs/cgroup:/sys/fs/cgroup:ro
58-
networks:
59-
- name: net1
55+
network: net1
6056
- name: testohpc-part2-1
6157
image: ${MOLECULE_IMAGE}
6258
pre_build_image: true
@@ -69,8 +65,7 @@ platforms:
6965
- /tmp
7066
volumes:
7167
- /sys/fs/cgroup:/sys/fs/cgroup:ro
72-
networks:
73-
- name: net1
68+
network: net1
7469
provisioner:
7570
name: ansible
7671
verifier:

‎molecule/test3/molecule.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
name: 2x partitions, group is partition
32
driver:
43
name: podman
54
platforms:
@@ -14,8 +13,7 @@ platforms:
1413
- /tmp
1514
volumes:
1615
- /sys/fs/cgroup:/sys/fs/cgroup:ro
17-
networks:
18-
- name: net1
16+
network: net1
1917
- name: testohpc-grp1-0
2018
image: ${MOLECULE_IMAGE}
2119
pre_build_image: true
@@ -28,8 +26,7 @@ platforms:
2826
- /tmp
2927
volumes:
3028
- /sys/fs/cgroup:/sys/fs/cgroup:ro
31-
networks:
32-
- name: net1
29+
network: net1
3330
- name: testohpc-grp1-1
3431
image: ${MOLECULE_IMAGE}
3532
pre_build_image: true
@@ -42,8 +39,7 @@ platforms:
4239
- /tmp
4340
volumes:
4441
- /sys/fs/cgroup:/sys/fs/cgroup:ro
45-
networks:
46-
- name: net1
42+
network: net1
4743
- name: testohpc-grp2-0
4844
image: ${MOLECULE_IMAGE}
4945
pre_build_image: true
@@ -56,8 +52,7 @@ platforms:
5652
- /tmp
5753
volumes:
5854
- /sys/fs/cgroup:/sys/fs/cgroup:ro
59-
networks:
60-
- name: net1
55+
network: net1
6156
- name: testohpc-grp2-1
6257
image: ${MOLECULE_IMAGE}
6358
pre_build_image: true
@@ -70,8 +65,7 @@ platforms:
7065
- /tmp
7166
volumes:
7267
- /sys/fs/cgroup:/sys/fs/cgroup:ro
73-
networks:
74-
- name: net1
68+
network: net1
7569
provisioner:
7670
name: ansible
7771
verifier:

‎molecule/test4/molecule.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ platforms:
1313
- /tmp
1414
volumes:
1515
- /sys/fs/cgroup:/sys/fs/cgroup:ro
16-
networks:
17-
- name: net1
16+
network: net1
1817
- name: testohpc-compute-0
1918
image: ${MOLECULE_IMAGE}
2019
pre_build_image: true
@@ -26,8 +25,7 @@ platforms:
2625
- /tmp
2726
volumes:
2827
- /sys/fs/cgroup:/sys/fs/cgroup:ro
29-
networks:
30-
- name: net1
28+
network: net1
3129
- name: testohpc-compute-1
3230
image: ${MOLECULE_IMAGE}
3331
pre_build_image: true
@@ -39,8 +37,7 @@ platforms:
3937
- /tmp
4038
volumes:
4139
- /sys/fs/cgroup:/sys/fs/cgroup:ro
42-
networks:
43-
- name: net1
40+
network: net1
4441
provisioner:
4542
name: ansible
4643
verifier:

0 commit comments

Comments
 (0)