Merge pull request #514 from Checkmk/devel

Release `4.2.0`

.github/workflows/ans-int-test-lkp-rules.yaml

@@ -54,7 +54,7 @@ jobs:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

.github/workflows/ans-int-test-lkp-rulesets.yaml

@@ -54,7 +54,7 @@ jobs:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

.gitignore

@@ -9,5 +9,7 @@ build/
 tests/output
 playbooks/vars/config.yml
 playbooks/test*.yml
+playbooks/hosts
+playbooks/hosts.bak
 Vagrantfile
 Vagrantfile.bak

Makefile

@@ -17,6 +17,10 @@ help:
 	@echo ""
 	@echo "vm              - Create a virtual development environment."
 	@echo "molecule        - Create a virtual environment for molecule tests."
+	@echo "vms        	   - Create a virtual environment with all boxes (exept for the development ones and ansidows)."
+	@echo "vms-debian 	   - Create a virtual environment with all Debian family OSes."
+	@echo "vms-redhat 	   - Create a virtual environment with all RedHat family OSes."
+	@echo "vms-suse 	   - Create a virtual environment with all Suse family OSes."
 	@echo ""
 	@echo "clean           - Clean up several things"
 	@echo "clean-vm        - Clean up virtual development environment."
@@ -52,6 +56,8 @@ setup-python:
 kvm:
 	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
 	cp Vagrantfile.kvm Vagrantfile
+	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
+	cp playbooks/hosts.kvm playbooks/hosts
 
 setup-kvm: kvm
 	@sudo apt update -y
@@ -74,6 +80,8 @@ setup-kvm: kvm
 vbox:
 	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
 	cp Vagrantfile.vbox Vagrantfile
+	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
+	cp playbooks/hosts.vbox playbooks/hosts
 
 setup-vbox: vbox
 
@@ -91,3 +99,18 @@ molecule:
 
 vm:
 	@vagrant up collection
+
+vms:
+	@vagrant up debsible ansibuntu anstream ansuse ansoracle # ansles ## currently no SLES box for libvirt!
+
+vms-debian:
+	@vagrant up debsible ansibuntu
+
+vms-redhat:
+	@vagrant up anstream ansoracle
+
+vms-suse:
+	@vagrant up ansuse # ansles ## currently no SLES box for libvirt!
+
+vms-windows:
+	@vagrant up ansidows

SUPPORT.md

@@ -48,3 +48,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 4.0.0 | 2.0.0p39, 2.1.0p36, 2.2.0p16 | 2.14, 2.15, 2.16 | Breaking changes to the following roles: `agent`, `server`.
 4.0.1 | 2.0.0p39, 2.1.0p36, 2.2.0p16 | 2.14, 2.15, 2.16 | None
 4.1.0 | 2.0.0p39, 2.1.0p37, 2.2.0p17 | 2.14, 2.15, 2.16 | None
+4.2.0 | 2.0.0p39, 2.1.0p38, 2.2.0p19 | 2.14, 2.15, 2.16 | None

Vagrantfile.kvm

@@ -12,10 +12,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "collection", primary: true do |srv|
     srv.vm.box = "generic/ubuntu2204"
     srv.vm.network :private_network,
-        :ip                         => "192.168.123.42",
+        :ip                         => "192.168.124.42",
         :libvirt__netmask           => "255.255.255.0",
         :libvirt__network_name      => "ansible_collection",
-        :libvirt__network_address   => "192.168.123.0"
+        :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -52,10 +52,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "molecule", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/ubuntu2004"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.43",
+    :ip                         => "192.168.124.43",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -93,10 +93,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "ansibuntu", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/ubuntu2204"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.61",
+    :ip                         => "192.168.124.61",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -115,10 +115,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "debsible", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/debian12"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.62",
+    :ip                         => "192.168.124.62",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -137,10 +137,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "anstream", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/centos9s"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.63",
+    :ip                         => "192.168.124.63",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -159,10 +159,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "ansuse", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/opensuse42"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.64",
+    :ip                         => "192.168.124.64",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -177,37 +177,36 @@ Vagrant.configure("2") do |config|
       inline: "zypper --quiet up -y"
   end
 
-  # SLES15 (No Box for libvirt found!!)
-  config.vm.define "ansles", autostart: false , primary: false do |srv|
-    srv.vm.box = "saltstack/cicd-sles15"
-    srv.vm.network :private_network,
-    :ip                         => "192.168.123.64",
-    :libvirt__netmask           => "255.255.255.0",
-    :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.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 = "ansles"
-      libvirt.memorybacking :access, :mode => 'shared'
-      libvirt.memorybacking :source, :type => 'memfd'
-    end
-    srv.vm.provision "shell",
-      inline: "zypper --quiet up -y"
-  end
-
+  # # SLES15 (No Box for libvirt found!!)
+  # config.vm.define "ansles", autostart: false , primary: false do |srv|
+  #   srv.vm.box = "saltstack/cicd-sles15"
+  #   srv.vm.network :private_network,
+  #   :ip                         => "192.168.124.64",
+  #   :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 = "ansles"
+  #     libvirt.memorybacking :access, :mode => 'shared'
+  #     libvirt.memorybacking :source, :type => 'memfd'
+  #   end
+  #   srv.vm.provision "shell",
+  #     inline: "zypper --quiet up -y"
+  # end
 
   # Oracle Linux
   config.vm.define "ansoracle", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/oracle8"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.66",
+    :ip                         => "192.168.124.66",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.ssh.insert_key = false
     srv.vm.provider "libvirt" do |libvirt|
       libvirt.default_prefix = "ansible_"
@@ -226,10 +225,10 @@ Vagrant.configure("2") do |config|
   config.vm.define "ansidows", autostart: false , primary: false do |srv|
     srv.vm.box = "peru/windows-server-2019-standard-x64-eval"
     srv.vm.network :private_network,
-    :ip                         => "192.168.123.67",
+    :ip                         => "192.168.124.67",
     :libvirt__netmask           => "255.255.255.0",
     :libvirt__network_name      => "ansible_collection",
-    :libvirt__network_address   => "192.168.123.0"
+    :libvirt__network_address   => "192.168.124.0"
     srv.winrm.max_tries = 100
     srv.winrm.retry_delay = 2
     srv.vm.boot_timeout = 180

changelogs/fragments/release_summary.yml

@@ -0,0 +1 @@
+release_summary: "Happy New Year!"

changelogs/fragments/roles.yml

@@ -0,0 +1,5 @@
+bugfixes:
+  - Agent role - Fix `become` in handler, which could cause errors on delegation.
+
+minor_changes:
+  - Server role - Improve role speed by skipping downloads.

changelogs/fragments/rule.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Rule module - Fix idempotency for rule location relative to another rule_id, by getting the target folder from neighbour rule.

changelogs/fragments/tag_group.yml

@@ -0,0 +1,5 @@
+major_changes:
+  - Tag_group module - Rewrite module and migrate to new collection API.
+
+minor_changes:
+  - Tag_group module - Enable `help` and `repair` options.

changelogs/fragments/user.yml

@@ -0,0 +1,5 @@
+major_changes:
+  - User module - Rewrite module and migrate to new collection API.
+
+minor_changes:
+  - User module - Enable several interface options.

galaxy.yml

@@ -10,7 +10,7 @@ name: general
 
 # The version of the collection. Must be compatible with semantic versioning
 
-version: 4.1.0
+version: 4.2.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md