Skip to content

Commit e6df4bd

Browse files
bodschbodsch
committed
update molecule config
1 parent d5b8b4e commit e6df4bd

File tree

19 files changed

+139
-116
lines changed

19 files changed

+139
-116
lines changed

Diff for: ‎roles/icinga2/collections.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
collections:
44
- name: bodsch.core
55
version: ">=1.0.17"
6+
- name: community.mysql

Diff for: ‎roles/icinga2/molecule/default/molecule.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ dependency:
55
driver:
66
name: docker
77

8-
# lint: |
9-
# set -e
10-
# yamllint .
11-
# ansible-lint .
12-
# flake8 .
13-
148
platforms:
159
- name: database
16-
image: "bodsch/ansible-debian:11"
10+
image: "bodsch/ansible-debian:12"
1711
command: ${MOLECULE_DOCKER_COMMAND:-""}
1812
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
1913
privileged: true
@@ -35,7 +29,7 @@ platforms:
3529
ipv4_address: "10.11.0.10"
3630

3731
- name: instance
38-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
32+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
3933
command: ${MOLECULE_DOCKER_COMMAND:-""}
4034
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
4135
privileged: true

Diff for: ‎roles/icinga2/molecule/default/prepare.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
- name: update pacman system
1414
ansible.builtin.command: |
1515
pacman --refresh --sync --sysupgrade --noconfirm
16+
register: pacman
17+
changed_when: pacman.rc != 0
18+
failed_when: pacman.rc != 0
1619

1720
- name: create depends service
1821
ansible.builtin.copy:
@@ -24,6 +27,14 @@
2427
when:
2528
- ansible_os_family | lower == 'artix linux'
2629

30+
- name: make sure python3-apt is installed (only debian based)
31+
ansible.builtin.package:
32+
name:
33+
- python3-apt
34+
state: present
35+
when:
36+
- ansible_os_family | lower == 'debian'
37+
2738
- name: update package cache
2839
become: true
2940
ansible.builtin.package:
@@ -37,13 +48,11 @@
3748
- "ansible version : {{ ansible_version.full }}"
3849
- "python version : {{ ansible_python.version.major }}.{{ ansible_python.version.minor }}"
3950

40-
4151
- name: prepare all
4252
hosts: all
4353
gather_facts: true
4454

4555
roles:
46-
- role: apparmor
4756
- role: snapd
4857
- role: monitoring-tools
4958

Diff for: ‎roles/icinga2/molecule/default/requirements.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
- name: snapd
44
src: https://github.com/bodsch/ansible-snapd
5-
version: 1.2.2
6-
7-
- name: apparmor
8-
src: https://github.com/bodsch/ansible-apparmor
9-
version: 2.0.0
5+
version: 1.3.1
106

117
- name: monitoring-tools
128
src: https://github.com/bodsch/ansible-monitoring-plugins
13-
version: 1.4.2
9+
version: 1.5.0
1410

1511
- name: mariadb
1612
src: https://github.com/bodsch/ansible-mariadb
17-
version: 2.4.1
13+
version: 2.5.0
1814

1915
...

Diff for: ‎roles/icinga2/molecule/icinga2-with-icingadb/molecule.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ dependency:
55
driver:
66
name: docker
77

8-
lint: |
9-
set -e
10-
yamllint .
11-
ansible-lint .
12-
flake8 .
13-
148
platforms:
159
- name: database
16-
image: "bodsch/ansible-debian:11"
10+
image: "bodsch/ansible-debian:12"
1711
command: ${MOLECULE_DOCKER_COMMAND:-""}
1812
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
1913
privileged: true
@@ -22,6 +16,8 @@ platforms:
2216
volumes:
2317
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2418
- /var/lib/containerd
19+
capabilities:
20+
- SYS_ADMIN
2521
tmpfs:
2622
- /run
2723
- /tmp
@@ -35,7 +31,7 @@ platforms:
3531
ipv4_address: "10.13.0.10"
3632

3733
- name: icingadb
38-
image: "bodsch/ansible-debian:11"
34+
image: "bodsch/ansible-debian:12"
3935
command: ${MOLECULE_DOCKER_COMMAND:-""}
4036
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
4137
privileged: true
@@ -44,6 +40,8 @@ platforms:
4440
volumes:
4541
- /sys/fs/cgroup:/sys/fs/cgroup:rw
4642
- /var/lib/containerd
43+
capabilities:
44+
- SYS_ADMIN
4745
tmpfs:
4846
- /run
4947
- /tmp
@@ -52,7 +50,7 @@ platforms:
5250
ipv4_address: "10.13.0.11"
5351

5452
- name: instance
55-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
53+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
5654
command: ${MOLECULE_DOCKER_COMMAND:-""}
5755
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
5856
privileged: true
@@ -61,6 +59,8 @@ platforms:
6159
volumes:
6260
- /sys/fs/cgroup:/sys/fs/cgroup:rw
6361
- /var/lib/containerd
62+
capabilities:
63+
- SYS_ADMIN
6464
tmpfs:
6565
- /run
6666
- /tmp

Diff for: ‎roles/icinga2/molecule/icinga2-with-icingadb/prepare.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
- name: update pacman system
1414
ansible.builtin.command: |
1515
pacman --refresh --sync --sysupgrade --noconfirm
16+
register: pacman
17+
changed_when: pacman.rc != 0
18+
failed_when: pacman.rc != 0
1619

1720
- name: create depends service
1821
ansible.builtin.copy:
@@ -24,6 +27,14 @@
2427
when:
2528
- ansible_os_family | lower == 'artix linux'
2629

30+
- name: make sure python3-apt is installed (only debian based)
31+
ansible.builtin.package:
32+
name:
33+
- python3-apt
34+
state: present
35+
when:
36+
- ansible_os_family | lower == 'debian'
37+
2738
- name: update package cache
2839
become: true
2940
ansible.builtin.package:
@@ -44,9 +55,9 @@
4455
any_errors_fatal: true
4556

4657
roles:
47-
- role: apparmor
48-
tags:
49-
- always
58+
# - role: apparmor
59+
# tags:
60+
# - always
5061
- role: snapd
5162
tags:
5263
- always

Diff for: ‎roles/icinga2/molecule/icinga2-with-icingadb/requirements.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22

33
- name: snapd
44
src: https://github.com/bodsch/ansible-snapd
5-
version: 1.2.2
6-
7-
- name: apparmor
8-
src: https://github.com/bodsch/ansible-apparmor
9-
version: 2.0.0
5+
version: 1.3.1
106

117
- name: monitoring-tools
128
src: https://github.com/bodsch/ansible-monitoring-plugins
13-
version: 1.4.2
9+
version: 1.5.0
1410

1511
- name: mariadb
1612
src: https://github.com/bodsch/ansible-mariadb
17-
version: 2.4.1
13+
version: 2.5.0
1814

1915
- name: redis
2016
src: https://github.com/bodsch/ansible-redis
21-
version: 1.4.0
17+
version: 1.4.1
2218

2319
...

Diff for: ‎roles/icinga2/molecule/icinga2-with-influxdb/molecule.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ dependency:
55
driver:
66
name: docker
77

8-
lint: |
9-
set -e
10-
yamllint .
11-
ansible-lint .
12-
flake8 .
13-
148
platforms:
159
- name: database
16-
image: "bodsch/ansible-debian:11"
10+
image: "bodsch/ansible-debian:12"
1711
command: ${MOLECULE_DOCKER_COMMAND:-""}
1812
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
1913
privileged: true
@@ -35,7 +29,7 @@ platforms:
3529
ipv4_address: "10.14.0.10"
3630

3731
- name: influxdb
38-
image: "bodsch/ansible-debian:11"
32+
image: "bodsch/ansible-debian:12"
3933
command: ${MOLECULE_DOCKER_COMMAND:-""}
4034
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
4135
privileged: true
@@ -52,7 +46,7 @@ platforms:
5246
ipv4_address: "10.14.0.11"
5347

5448
- name: instance
55-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
49+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
5650
command: ${MOLECULE_DOCKER_COMMAND:-""}
5751
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
5852
privileged: true

Diff for: ‎roles/icinga2/molecule/icinga2-with-influxdb/prepare.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
- name: update pacman system
1414
ansible.builtin.command: |
1515
pacman --refresh --sync --sysupgrade --noconfirm
16+
register: pacman
17+
changed_when: pacman.rc != 0
18+
failed_when: pacman.rc != 0
1619

1720
- name: create depends service
1821
ansible.builtin.copy:
@@ -24,6 +27,14 @@
2427
when:
2528
- ansible_os_family | lower == 'artix linux'
2629

30+
- name: make sure python3-apt is installed (only debian based)
31+
ansible.builtin.package:
32+
name:
33+
- python3-apt
34+
state: present
35+
when:
36+
- ansible_os_family | lower == 'debian'
37+
2738
- name: update package cache
2839
become: true
2940
ansible.builtin.package:
@@ -44,9 +55,6 @@
4455
any_errors_fatal: true
4556

4657
roles:
47-
- role: apparmor
48-
tags:
49-
- always
5058
- role: snapd
5159
tags:
5260
- always

Diff for: ‎roles/icinga2/molecule/icinga2-with-influxdb/requirements.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22

33
- name: snapd
44
src: https://github.com/bodsch/ansible-snapd
5-
version: 1.2.2
6-
7-
- name: apparmor
8-
src: https://github.com/bodsch/ansible-apparmor
9-
version: 2.0.0
5+
version: 1.3.1
106

117
- name: monitoring-tools
128
src: https://github.com/bodsch/ansible-monitoring-plugins
13-
version: 1.4.2
9+
version: 1.5.0
1410

1511
- name: mariadb
1612
src: https://github.com/bodsch/ansible-mariadb
17-
version: 2.4.1
13+
version: 2.5.0
1814

1915
- name: influxdb
2016
src: mkayontour.influxdb

Diff for: ‎roles/icinga2/molecule/primary-as-ha/molecule.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@ dependency:
55
driver:
66
name: docker
77

8-
lint: |
9-
set -e
10-
yamllint .
11-
ansible-lint .
12-
flake8 .
13-
148
platforms:
159
- name: database
16-
image: "bodsch/ansible-debian:11"
10+
image: "bodsch/ansible-debian:12"
1711
command: ${MOLECULE_DOCKER_COMMAND:-""}
1812
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
1913
privileged: true
@@ -35,7 +29,7 @@ platforms:
3529
ipv4_address: "10.15.0.10"
3630

3731
- name: primary1
38-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
32+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
3933
command: ${MOLECULE_DOCKER_COMMAND:-""}
4034
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
4135
privileged: true
@@ -55,7 +49,7 @@ platforms:
5549
ipv4_address: "10.15.0.21"
5650

5751
- name: primary2
58-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
52+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
5953
command: ${MOLECULE_DOCKER_COMMAND:-""}
6054
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
6155
privileged: true
@@ -75,7 +69,7 @@ platforms:
7569
ipv4_address: "10.15.0.22"
7670

7771
- name: satellite
78-
image: "bodsch/ansible-${DISTRIBUTION:-debian:11}"
72+
image: "bodsch/ansible-${DISTRIBUTION:-debian:12}"
7973
command: ${MOLECULE_DOCKER_COMMAND:-""}
8074
docker_host: "${DOCKER_HOST:-unix://run/docker.sock}"
8175
privileged: true

0 commit comments

Comments
 (0)