Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,28 @@ Vagrant.configure("2") do |config|
inline: "zypper --quiet up -y"
end

# Rocky
config.vm.define "rocksible", autostart: false , primary: false do |srv|
srv.vm.box = "generic/rocky9"
srv.vm.network :private_network,
:ip => "192.168.124.65",
:libvirt__netmask => "255.255.255.0",
:libvirt__network_name => "ansible_collection",
:libvirt__network_address => "192.168.124.0"
srv.ssh.insert_key = false
srv.vm.provider "libvirt" do |libvirt|
libvirt.default_prefix = "ansible_"
libvirt.description = 'This box is used to test roles against.'
libvirt.memory = 2048
libvirt.cpus = 2
libvirt.title = "rocksible"
libvirt.memorybacking :access, :mode => 'shared'
libvirt.memorybacking :source, :type => 'memfd'
end
srv.vm.provision "shell",
inline: "dnf --quiet check-update ; dnf -y install vim curl wget git"
end

# Oracle Linux
config.vm.define "ansoracle", autostart: false , primary: false do |srv|
srv.vm.box = "generic/oracle8"
Expand Down
2 changes: 1 addition & 1 deletion playbooks/inventory/hosts.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ansibuntu ansible_host=192.168.124.61 checkmk_var_folder_path="/test"
debsible ansible_host=192.168.124.62 checkmk_var_folder_path="/foo"
anstream ansible_host=192.168.124.63 checkmk_var_folder_path="foo/bar"
ansuse ansible_host=192.168.124.64 checkmk_var_folder_path="/bar"
ansles ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
rocksible ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
ansoracle ansible_host=192.168.124.66 checkmk_var_folder_path="/foo"

[linux:vars]
Expand Down
2 changes: 1 addition & 1 deletion roles/agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Please make sure it is installed on your system and available for Ansible.

### Basic Configuration

checkmk_agent_version: "2.4.0p15"
checkmk_agent_version: "2.4.0p16"

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

Expand Down
2 changes: 1 addition & 1 deletion roles/agent/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
## Basic Configuration
checkmk_agent_version: "2.4.0p15"
checkmk_agent_version: "2.4.0p16"
checkmk_agent_edition: 'cre'
checkmk_agent_server_protocol: 'http'
checkmk_agent_server: 'localhost'
Expand Down
4 changes: 2 additions & 2 deletions roles/agent/molecule/2.4.0/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
when: ansible_distribution == 'Ubuntu'

# See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
- name: "Fix permissions on /etc/shadow for Rocky 9." # noqa no-changed-when
- name: "Fix permissions on /etc/shadow for Rocky 9 and 10." # noqa no-changed-when
ansible.builtin.command: chmod 0400 /etc/shadow
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')

tasks:

Expand Down
2 changes: 1 addition & 1 deletion roles/agent/molecule/2.4.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.4.0p15"
checkmk_var_version: "2.4.0p16"
checkmk_var_edition: "cre"
checkmk_var_checkmk_site: "mysite"
checkmk_var_automation_user: "cmkadmin"
Expand Down
6 changes: 6 additions & 0 deletions roles/agent/molecule/2.4.0/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ platforms:
pre_build_image: true
privileged: true
systemd: always
- name: rockylinux10
image: docker.io/geerlingguy/docker-rockylinux10-ansible
command: ${MOLECULE_DOCKER_COMMAND:-""}
pre_build_image: true
privileged: true
systemd: always
provisioner:
name: ansible
config_options:
Expand Down
2 changes: 1 addition & 1 deletion roles/server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To learn about the distributions used in automated tests, inspect the correspond

### Basic Configuration

checkmk_server_version: "2.4.0p15"
checkmk_server_version: "2.4.0p16"

The global Checkmk version. This is used for installing Checkmk.
To manage sites and their version, see `checkmk_server_sites`.
Expand Down
8 changes: 7 additions & 1 deletion roles/server/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,31 @@
checkmk_server_server_stable_os:
- AlmaLinux-8
- AlmaLinux-9
- AlmaLinux-10
- CentOS-7
- CentOS-8
- CentOS-9
- CentOS-10
- Debian-10
- Debian-11
- Debian-12
- RedHat-7
- RedHat-8
- RedHat-9
- RedHat-10
- OracleLinux-8
- OracleLinux-9
- OracleLinux-10
- Rocky-8
- Rocky-9
- Rocky-10
- Ubuntu-18
- Ubuntu-20
- Ubuntu-22
- Ubuntu-24

## Basic Configuration
checkmk_server_version: "2.4.0p15"
checkmk_server_version: "2.4.0p16"
checkmk_server_edition: 'cre'
checkmk_server_verify_setup: true
checkmk_server_epel_gpg_check: true
Expand Down
4 changes: 2 additions & 2 deletions roles/server/molecule/2.4.0/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
when: ansible_distribution == 'Ubuntu'

# See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
- name: "Fix permissions on /etc/shadow for Rocky 9." # noqa no-changed-when
- name: "Fix permissions on /etc/shadow for Rocky 9 and 10." # noqa no-changed-when
ansible.builtin.command: chmod 0400 /etc/shadow
when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')

- name: "Download MKP."
ansible.builtin.get_url:
Expand Down
2 changes: 1 addition & 1 deletion roles/server/molecule/2.4.0/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# General
checkmk_var_version: "2.4.0p15"
checkmk_var_version: "2.4.0p16"
checkmk_var_edition: "cre"
checkmk_server_verify_setup: true
checkmk_var_server_url: "http://127.0.0.1/"
Expand Down
6 changes: 6 additions & 0 deletions roles/server/molecule/2.4.0/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ platforms:
pre_build_image: true
privileged: true
systemd: always
- name: rockylinux10
image: docker.io/geerlingguy/docker-rockylinux10-ansible
command: ${MOLECULE_DOCKER_COMMAND:-""}
pre_build_image: true
privileged: true
systemd: always
provisioner:
name: ansible
config_options:
Expand Down