Merge "Use collections in validations for Ansible 2.11"

.ansible-lint

@@ -1,5 +1,6 @@
 exclude_paths:
     - releasenotes/
+    - ci/playbooks/
 parseable: true
 quiet: false
 rulesdir:

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
         always_run: true
         pass_filenames: false
         additional_dependencies:
-          - 'ansible<2.10'
+          - 'ansible-core<2.12'
         verbose: true
         entry: ansible-lint --force-color -p -v
 

ansible-collections-requirements.yml

@@ -0,0 +1,5 @@
+---
+collections:
+  - containers.podman
+  - community.general
+  - ansible.posix

ci/playbooks/pre.yml

@@ -45,6 +45,9 @@
         virtualenv_command: "{{ ensure_pip_virtualenv_command }}"
         virtualenv_site_packages: true
 
+    - name: Set up collections
+      command: "{{ ansible_user_dir }}/test-python/bin/ansible-galaxy install -fr {{ tripleo_validations_project_path }}/ansible-collections-requirements.yml"
+
     - name: Display test-python virtualenv package versions
       shell: |-
         . {{ ansible_user_dir }}/test-python/bin/activate

molecule-requirements.txt

@@ -1,6 +1,6 @@
 # this is required for the molecule jobs
 ansi2html>=1.6.0 # LGPLv3+
-ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0  # GPLv3+
+ansible-core<2.12  # GPLv3+
 jinja2>=2.8.0 # BSD-3-Clause
 molecule>=3.3.1,<4 # MIT
 molecule-podman>=0.3.0 # MIT

roles/check_nfv_ovsdpdk_zero_packet_loss/tasks/check_nfv_instances.yml

@@ -11,7 +11,7 @@
     instance_xml_data: "{{ instance_xml.stdout }}"
 
 - name: Get interfaces from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/devices/interface
     content: attribute

roles/check_nfv_ovsdpdk_zero_packet_loss/tasks/validate_instance.yml

@@ -1,6 +1,6 @@
 ---
 - name: Get instance numa node from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/numatune/memory
     content: attribute
@@ -13,7 +13,7 @@
 
 # Validates the instance vcpus list.
 - name: Get vcpu list from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/cputune/vcpupin
     content: attribute
@@ -44,7 +44,7 @@
 
 # Validates instance emulatorpin threads
 - name: Get emulatorpin list from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/cputune/emulatorpin
     content: attribute
@@ -62,7 +62,7 @@
 
 # Validates instance huge page size length is greater than or equal to 6.
 - name: Get hugepages from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/memoryBacking/hugepages/page
     content: attribute
@@ -77,7 +77,7 @@
 
 # Validates instance tx rx queue sizes and should be greater than or equal to 1024.
 - name: Get {{ vm_id }} libvirt tx | rx queue sizes from xml string
-  xml:
+  community.general.xml:
     xmlstring: "{{ instance_xml_data }}"
     xpath: /domain/devices/interface/driver
     content: attribute

roles/nova_svirt/tasks/validate.yml

@@ -2,7 +2,7 @@
 - name: "Parse {{ item.path }}"
   become: true
   register: seclabels
-  xml:
+  community.general.xml:
     path: "{{ item.path }}"
     content: attribute
     xpath: '/domstatus/domain/seclabel'

tox.ini

@@ -29,6 +29,7 @@ setenv =
   LC_ALL=en_US.UTF-8
   HOME={envdir}
 commands =
+    ansible-galaxy install -fr {toxinidir}/ansible-collections-requirements.yml
     stestr run --slowest --color {posargs}
 deps =
     -c {env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}