Skip to content

Commit da56a98

Browse files
committed
Add support for RedHat 10.
1 parent d3447fb commit da56a98

File tree

12 files changed

+65
-11
lines changed

12 files changed

+65
-11
lines changed

Vagrantfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,28 @@ Vagrant.configure("2") do |config|
133133
inline: "zypper --quiet up -y"
134134
end
135135

136+
# Rocky
137+
config.vm.define "rocksible", autostart: false , primary: false do |srv|
138+
srv.vm.box = "generic/rocky9"
139+
srv.vm.network :private_network,
140+
:ip => "192.168.124.65",
141+
:libvirt__netmask => "255.255.255.0",
142+
:libvirt__network_name => "ansible_collection",
143+
:libvirt__network_address => "192.168.124.0"
144+
srv.ssh.insert_key = false
145+
srv.vm.provider "libvirt" do |libvirt|
146+
libvirt.default_prefix = "ansible_"
147+
libvirt.description = 'This box is used to test roles against.'
148+
libvirt.memory = 2048
149+
libvirt.cpus = 2
150+
libvirt.title = "anstream"
151+
libvirt.memorybacking :access, :mode => 'shared'
152+
libvirt.memorybacking :source, :type => 'memfd'
153+
end
154+
srv.vm.provision "shell",
155+
inline: "dnf --quiet check-update ; dnf -y install vim curl wget git"
156+
end
157+
136158
# Oracle Linux
137159
config.vm.define "ansoracle", autostart: false , primary: false do |srv|
138160
srv.vm.box = "generic/oracle8"

playbooks/inventory/hosts.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ansibuntu ansible_host=192.168.124.61 checkmk_var_folder_path="/test"
1010
debsible ansible_host=192.168.124.62 checkmk_var_folder_path="/foo"
1111
anstream ansible_host=192.168.124.63 checkmk_var_folder_path="foo/bar"
1212
ansuse ansible_host=192.168.124.64 checkmk_var_folder_path="/bar"
13-
ansles ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
13+
rocksible ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
1414
ansoracle ansible_host=192.168.124.66 checkmk_var_folder_path="/foo"
1515

1616
[linux:vars]

roles/agent/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please make sure it is installed on your system and available for Ansible.
1818

1919
### Basic Configuration
2020

21-
checkmk_agent_version: "2.4.0p15"
21+
checkmk_agent_version: "2.4.0p16"
2222

2323
The Checkmk version of the site your agents will talk to.
2424

roles/agent/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
## Basic Configuration
3-
checkmk_agent_version: "2.4.0p15"
3+
checkmk_agent_version: "2.4.0p16"
44
checkmk_agent_edition: 'cre'
55
checkmk_agent_server_protocol: 'http'
66
checkmk_agent_server: 'localhost'

roles/agent/molecule/2.4.0/converge.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,16 @@
3838
when: ansible_distribution == 'Ubuntu'
3939

4040
# See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
41-
- name: "Fix permissions on /etc/shadow for Rocky 9." # noqa no-changed-when
41+
- name: "Fix permissions on /etc/shadow for Rocky 9 and 10." # noqa no-changed-when
4242
ansible.builtin.command: chmod 0400 /etc/shadow
43-
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
43+
when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')
44+
45+
# See: https://github.com/geerlingguy/docker-rockylinux10-ansible/pull/1
46+
- name: "Install gpg for Rocky 10."
47+
ansible.builtin.package:
48+
name: gpg
49+
state: present
50+
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '10'
4451

4552
tasks:
4653

roles/agent/molecule/2.4.0/group_vars/all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# General
3-
checkmk_var_version: "2.4.0p15"
3+
checkmk_var_version: "2.4.0p16"
44
checkmk_var_edition: "cre"
55
checkmk_var_checkmk_site: "mysite"
66
checkmk_var_automation_user: "cmkadmin"

roles/agent/molecule/2.4.0/molecule.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ platforms:
3434
pre_build_image: true
3535
privileged: true
3636
systemd: always
37+
- name: rockylinux10
38+
image: docker.io/geerlingguy/docker-rockylinux10-ansible
39+
command: ${MOLECULE_DOCKER_COMMAND:-""}
40+
pre_build_image: true
41+
privileged: true
42+
systemd: always
3743
provisioner:
3844
name: ansible
3945
config_options:

roles/server/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To learn about the distributions used in automated tests, inspect the correspond
2727

2828
### Basic Configuration
2929

30-
checkmk_server_version: "2.4.0p15"
30+
checkmk_server_version: "2.4.0p16"
3131

3232
The global Checkmk version. This is used for installing Checkmk.
3333
To manage sites and their version, see `checkmk_server_sites`.

roles/server/defaults/main.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,31 @@
88
checkmk_server_server_stable_os:
99
- AlmaLinux-8
1010
- AlmaLinux-9
11+
- AlmaLinux-10
1112
- CentOS-7
1213
- CentOS-8
1314
- CentOS-9
15+
- CentOS-10
1416
- Debian-10
1517
- Debian-11
1618
- Debian-12
1719
- RedHat-7
1820
- RedHat-8
1921
- RedHat-9
22+
- RedHat-10
2023
- OracleLinux-8
24+
- OracleLinux-9
25+
- OracleLinux-10
2126
- Rocky-8
2227
- Rocky-9
28+
- Rocky-10
2329
- Ubuntu-18
2430
- Ubuntu-20
2531
- Ubuntu-22
2632
- Ubuntu-24
2733

2834
## Basic Configuration
29-
checkmk_server_version: "2.4.0p15"
35+
checkmk_server_version: "2.4.0p16"
3036
checkmk_server_edition: 'cre'
3137
checkmk_server_verify_setup: true
3238
checkmk_server_epel_gpg_check: true

roles/server/molecule/2.4.0/converge.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,16 @@
2929
when: ansible_distribution == 'Ubuntu'
3030

3131
# See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
32-
- name: "Fix permissions on /etc/shadow for Rocky 9." # noqa no-changed-when
32+
- name: "Fix permissions on /etc/shadow for Rocky 9 and 10." # noqa no-changed-when
3333
ansible.builtin.command: chmod 0400 /etc/shadow
34-
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
34+
when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')
35+
36+
# See: https://github.com/geerlingguy/docker-rockylinux10-ansible/pull/1
37+
- name: "Install gpg for Rocky 10."
38+
ansible.builtin.package:
39+
name: gpg
40+
state: present
41+
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '10'
3542

3643
- name: "Download MKP."
3744
ansible.builtin.get_url:

0 commit comments

Comments
 (0)