Merge branch 'master' into fix_ovirt_quota

.automation/build.sh

@@ -67,7 +67,8 @@ cp -r "$OVIRT_BUILD"/* "$OVIRT_BUILD"/.config "$COLLECTION_DIR"
 cd "$COLLECTION_DIR"
 
 antsibull-changelog lint -v
-ansible-lint roles/*
+#skip linting, done in separate github workflow
+#ansible-lint roles/*
 
 cd "$ROOT_PATH"
 

.github/workflows/build.yaml

@@ -19,6 +19,9 @@ jobs:
           sudo add-apt-repository ppa:deadsnakes/ppa
           sudo apt-get install python3.9-venv -y
 
+      - name: Install ansible.posix
+        run: ansible-galaxy collection install -c ansible.posix
+
       - name: Checkout
         uses: ovirt/checkout-action@main
 
@@ -49,7 +52,7 @@ jobs:
             "ansible-lint>=6.0.0,<7.0.0" \
             cryptography \
             "pyyaml>=5.4.1"
-          ansible-lint roles/* -x 204
+          ansible-lint -x 'key-order[task],no-free-form,schema[vars],yaml[octal-values],risky-shell-pipe,fqcn[keyword]' roles/*
   build:
     runs-on: ubuntu-latest
     strategy:
@@ -69,6 +72,9 @@ jobs:
       - name: Install python3.9 modules
         run: ${{ matrix.pip-command }} install pycodestyle pylint voluptuous yamllint rstcheck antsibull-changelog rich "ansible-lint>=6.0.0,<7.0.0" cryptography
 
+      - name: Install ansible.posix
+        run: ansible-galaxy collection install -c ansible.posix
+
       - name: Checkout
         uses: ovirt/checkout-action@main
 

changelogs/fragments/700-fix-directlun.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+      - ovirt_disk -  Fix issue in detaching the direct LUN (https://github.com/oVirt/ovirt-ansible-collection/pull/700)

changelogs/fragments/702-drop-netaddr2.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+      - HE - drop remaining filters using netaddr (https://github.com/oVirt/ovirt-ansible-collection/pull/702)

changelogs/fragments/704-drop-netaddr3.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+          - HE - fix ipv4 and ipv6 check after dropping netaddr (https://github.com/oVirt/ovirt-ansible-collection/pull/704)

changelogs/fragments/706-he-update-README.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+      - hosted_engine_setup -  Update README (https://github.com/oVirt/ovirt-ansible-collection/pull/706)

plugins/modules/ovirt_disk.py

@@ -731,7 +731,7 @@ def update_check(self, entity):
             equal(self.param('propagate_errors'), entity.propagate_errors) and
             equal(otypes.ScsiGenericIO(self.param('scsi_passthrough')) if self.param('scsi_passthrough') else None, entity.sgio) and
             equal(self.param('wipe_after_delete'), entity.wipe_after_delete) and
-            equal(self.param('profile'), follow_link(self._connection, entity.disk_profile).name)
+            equal(self.param('profile'), getattr(follow_link(self._connection, entity.disk_profile), 'name', None))
         )
 
 

roles/hosted_engine_setup/README.md

@@ -318,7 +318,7 @@ $ ansible-playbook hosted_engine_deploy.yml --extra-vars='@he_deployment.json' -
 
 Deployment over a remote host:
 ```sh
-ansible-playbook -i host123.localdomain, hosted_engine_deploy.yml --extra-vars='@he_deployment.json' --extra-vars='@passwords.yml' --ask-vault-pass
+$ ansible-playbook -i host123.localdomain, hosted_engine_deploy.yml --extra-vars='@he_deployment.json' --extra-vars='@passwords.yml' --ask-vault-pass
 ```
 
 Deploy over a remote host from Ansible AWX/Tower

roles/hosted_engine_setup/hooks/after_setup/add_host_storage_domain.yml

@@ -8,7 +8,7 @@
 
 - name: Set Engine public key as authorized key without validating the TLS/SSL certificates
   connection: ssh
-  authorized_key:
+  ansible.posix.authorized_key:
     user: root
     state: present
     key: https://{{ he_fqdn }}/ovirt-engine/services/pki-resource?resource=engine-certificate&format=OPENSSH-PUBKEY

roles/hosted_engine_setup/tasks/bootstrap_local_vm/05_add_host.yml

@@ -34,7 +34,7 @@
       register: vlan_id_out
       changed_when: true
     - name: Set Engine public key as authorized key without validating the TLS/SSL certificates
-      authorized_key:
+      ansible.posix.authorized_key:
         user: root
         state: present
         key: https://{{ he_fqdn }}/ovirt-engine/services/pki-resource?resource=engine-certificate&format=OPENSSH-PUBKEY

roles/hosted_engine_setup/tasks/create_target_vm/03_hosted_engine_final_tasks.yml

@@ -217,15 +217,15 @@
         owner: root
         group: root
         mode: 0644
-      when: he_vm_ip_addr is not none and he_vm_ip_addr | ipv4
+      when: he_vm_ip_addr is not none and not he_vm_ip_addr is search(":")
     - name: Generate static network configuration for the engine VM, IPv6
       ansible.builtin.template:
         src: templates/ifcfg-eth0-static-ipv6.j2
         dest: "{{ he_local_vm_dir }}/ifcfg-eth0"
         owner: root
         group: root
         mode: 0644
-      when: he_vm_ip_addr is not none and he_vm_ip_addr | ipv6
+      when: he_vm_ip_addr is not none and he_vm_ip_addr is search(":")
     - name: Inject network configuration with guestfish
       ansible.builtin.command: >-
         guestfish -a {{ local_vm_disk_path }} --rw -i copy-in "{{ he_local_vm_dir }}/ifcfg-eth0"

roles/hosted_engine_setup/tasks/fetch_host_ip.yml

@@ -33,7 +33,7 @@
       ansible.builtin.set_fact:
         he_host_ip: "{{
         (
-          hostname_resolution_output.stdout.split() | 
+          hostname_resolution_output.stdout.split() |
             intersect(hostname_addresses_output.stdout.split())
         )[0]
         }}"