Merge pull request #674 from Checkmk/devel

Fix build related changes for main branch

.github/dependabot.yml

@@ -1,5 +1,12 @@
 version: 2
 updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "05:00"
+    target-branch: "devel"
+    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/python-qa.yaml

@@ -20,9 +20,9 @@ jobs:
         with:
           python-version: '3.11'
           cache: pip
-          cache-dependency-path: requirements-qa.txt
+          cache-dependency-path: qa-requirements.txt
       - name: Install linters
-        run: python -m pip install -r requirements-qa.txt
+        run: python -m pip install -r qa-requirements.txt
       - name: Check format
         run: black --check --diff plugins
         if: always()

Makefile

@@ -103,7 +103,7 @@ vagrant:
 	@sudo apt update -y
 	@sudo apt -y install vagrant
 	@sudo usermod -aG libvirt $(USER)
-	@vagrant plugin install vagrant-libvirt
+	@vagrant plugin install vagrant-libvirt vagrant-reload
 
 venv:
 	@python3 -m venv venv

README.md

@@ -42,7 +42,7 @@ You can find playbooks, demonstrating the content of this collection in the fold
 
 Name | Description | Tests
 --- | --- | ---
-[checkmk.general.checkmk](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/inventory/checkmk.py)|Dynamic Inventory Source for Checkmk | [![Ansible Unit Test for Inventory Module](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-unit-test-inventory.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-unit-test-inventory.yaml)
+[checkmk.general.checkmk](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/plugins/inventory/checkmk.py)|Dynamic Inventory Source for Checkmk | [![Ansible Unit Test for Inventory Module.](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-unit-test-inventory.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/ans-unit-test-inventory.yaml)
 
 ### Lookup plugins
 Click on the lookup plugin name below, to get detailed documentation about it.
@@ -88,7 +88,7 @@ Click on the role name below, to get documentation about the role.
 Name | Description | Tests
 --- | --- | ---
 [checkmk.general.agent](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/roles/agent/README.md)|Installs Checkmk agents.| [![Molecule Tests for Agent Role](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-agent.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-agent.yaml)
-[checkmk.general.server](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/roles/server/README.md)|Installs Checkmk servers.|[![Molecule Tests for Server Role](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-server.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-server.yaml)
+[checkmk.general.server](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/roles/server/README.md)|Installs Checkmk servers and manages Checkmk sites.|[![Molecule Tests for Server Role](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-server.yaml/badge.svg)](https://github.com/Checkmk/ansible-collection-checkmk.general/actions/workflows/molecule-role-server.yaml)
 <!--end collection content-->
 
 ## Additional content

Vagrantfile

@@ -32,7 +32,7 @@ Vagrant.configure("2") do |config|
     apt-get -y install python3-pip ca-certificates curl gnupg lsb-release qemu-guest-agent python3.8 python3.9 python3.10 python3.11 python3.12
     sudo -u vagrant python3 -m pip install pip --upgrade
     sudo -u vagrant python3 -m pip install -r /home/vagrant/ansible_collections/checkmk/general/requirements.txt
-    sudo -u vagrant python3 -m pip install -r /home/vagrant/ansible_collections/checkmk/general/requirements-qa.txt
+    sudo -u vagrant python3 -m pip install -r /home/vagrant/ansible_collections/checkmk/general/qa-requirements.txt
     sudo -u vagrant ansible-galaxy collection install -f -r /home/vagrant/ansible_collections/checkmk/general/requirements.yml
     mkdir -p /home/vagrant/ansible_collections/checkmk/general
     mkdir -p /etc/apt/keyrings
@@ -46,6 +46,7 @@ Vagrant.configure("2") do |config|
     hostnamectl set-hostname collection
     SCRIPT
     srv.vm.provision "shell", inline: $script
+    srv.vm.provision :reload
     srv.vm.synced_folder "./", "/home/vagrant/ansible_collections/checkmk/general/", type: "virtiofs"
   end
 
@@ -117,7 +118,7 @@ Vagrant.configure("2") do |config|
 
   # openSUSE
   config.vm.define "ansuse", autostart: false , primary: false do |srv|
-    srv.vm.box = "generic/opensuse42"
+    srv.vm.box = "generic/opensuse15"
     srv.vm.network :private_network,
     :ip                         => "192.168.124.64",
     :libvirt__netmask           => "255.255.255.0",

plugins/modules/host.py

@@ -79,22 +79,22 @@
     #     type: str
     nodes:
         description:
-            - Nodes, members of the cluster-container host provided in name.
+            - Nodes, members of the cluster host provided in name.
               B(Mutualy exclusive with I(add_nodes) and I(remove_nodes).)
         required: false
         type: list
         elements: str
     add_nodes:
         description:
-            - List of nodes to be added as members of the cluster-container host provided in name.
+            - List of nodes to be added as members of the cluster host provided in name.
               Works only if the existing host was already a cluster host, or entirely new is created.
               B(Mutualy exclusive with I(nodes) and I(remove_nodes).)
         required: false
         type: list
         elements: str
     remove_nodes:
         description:
-            - List of nodes to be removes from the cluster-container host provided in name.
+            - List of nodes to be removes from the cluster host provided in name.
               B(Mutualy exclusive with I(nodes) and I(add_nodes).)
         required: false
         type: list
@@ -148,7 +148,7 @@
 
 # Create a cluster host.
 - name: "Create a cluster host."
-  checkmk.general.cluster:
+  checkmk.general.host:
     server_url: "http://myserver/"
     site: "mysite"
     automation_user: "myuser"
@@ -160,7 +160,7 @@
 
 # Create a cluster host with IP.
 - name: "Create a cluster host with IP address."
-  checkmk.general.cluster:
+  checkmk.general.host:
     server_url: "http://myserver/"
     site: "mysite"
     automation_user: "myuser"

tests/integration/targets/bakery/tasks/test.yml

@@ -44,7 +44,7 @@
     automation_user: "{{ checkmk_var_automation_user }}"
     automation_secret: "{{ checkmk_var_automation_secret }}"
     signature_key_id: "{{ checkmk_var_signature_key_id }}"
-    signature_key_passphrase: "{{ signature_key_passphrase }}"
+    signature_key_passphrase: "{{ checkmk_var_signature_key_passphrase }}"
     state: "signed"
   delegate_to: localhost
   run_once: true  # noqa run-once[task]
@@ -56,7 +56,7 @@
     automation_user: "{{ checkmk_var_automation_user }}"
     automation_secret: "{{ checkmk_var_automation_secret }}"
     signature_key_id: "{{ checkmk_var_signature_key_id }}"
-    signature_key_passphrase: "{{ signature_key_passphrase }}"
+    signature_key_passphrase: "{{ checkmk_var_signature_key_passphrase }}"
     state: "baked_signed"
   delegate_to: localhost
   run_once: true  # noqa run-once[task]

tests/integration/targets/site/vars/main.yml

@@ -24,7 +24,7 @@ checkmk_var_test_sites:
             url_of_remote_site: "http://localhost/stable_cme_r1/check_mk/"
           basic_settings:
             site_id: "stable_cme_r1"
-            checkmk_var_customer: "provider"
+            customer: "provider"
             alias: "stable_cme remote site 1"
         authentication:
           username: "cmkadmin"
@@ -50,7 +50,7 @@ checkmk_var_test_sites:
             url_of_remote_site: "http://localhost/stable_cme_r2/check_mk/"
           basic_settings:
             site_id: "stable_cme_r2"
-            checkmk_var_customer: "provider"
+            customer: "provider"
             alias: "stable_cme remote site 2"
         authentication:
           username: "cmkadmin"
@@ -94,7 +94,7 @@ checkmk_var_test_sites:
             replicate_extensions: false
           basic_settings:
             site_id: "stable_cme_r3"
-            checkmk_var_customer: "provider"
+            customer: "provider"
             alias: "stable_cme remote site 3"
         authentication:
           username: "cmkadmin"