Fix CI

.github/workflows/lint-collection.yml

@@ -4,4 +4,4 @@ name: Ansible collection linters
   pull_request:
 jobs:
   lint:
-    uses: stackhpc/.github/.github/workflows/lint-collection.yml@main
+    uses: stackhpc/.github/.github/workflows/lint-collection.yml@bump-ansible

.github/workflows/pull_request.yml

@@ -16,8 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         pulp:
-          - "3.21"
           - "3.45"
+          - "3.81"
     steps:
       # Checks-out the repository under $GITHUB_WORKSPACE, so it's accessible to the job
       - uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install ansible==5.* jmespath pulp-glue==0.21.*
+          pip install ansible==13.* jmespath pulp-glue==0.21.*
           ansible-galaxy collection install git+file://$(pwd)
 
       - name: Run Pulp in one

README.md

@@ -7,12 +7,15 @@ Note: Pulp server installation is out of this collection's scope - for this purp
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9-2.10 releases.
+Tested with the current Ansible 13 releases.
 
 ## Included content
 
 pulp_contentguard role
 pulp_repository role
+pulp_distribution role
+pulp_django_user role
+pulp_group role
 
 ## Using this collection
 

galaxy.yml

@@ -2,14 +2,15 @@ namespace: stackhpc
 name: pulp
 description: >
   Roles and plugins Pulp repository server configuration
-version: "0.5.5"
+version: "0.6.0"
 readme: "README.md"
 authors:
   - "Piotr Parczewski"
   - "Michał Nasiadka"
   - "Mark Goddard"
+  - "Alex Welsh"
 dependencies:
-  "pulp.squeezer": "*"
+  "pulp.squeezer": ">=0.20.0"
 license:
   - "Apache-2.0"
 tags:

roles/pulp_container_content/tasks/main.yml

@@ -1,36 +1,6 @@
 ---
 - name: Add or remove content units
-  stackhpc.pulp.pulp_container_content:
-    pulp_url: "{{ pulp_url }}"
-    username: "{{ pulp_username }}"
-    password: "{{ pulp_password }}"
-    validate_certs: "{{ pulp_validate_certs | bool }}"
-    allow_missing: "{{ item.allow_missing | default(omit) }}"
-    is_push: "{{ item.is_push | default(omit) }}"
-    src_repo: "{{ item.src_repo | default(omit) }}"
-    src_is_push: "{{ item.src_is_push | default(omit) }}"
-    repository: "{{ item.repository }}"
-    tags: "{{ item.tags }}"
-    state: "{{ item.state | default(omit) }}"
-    wait: "{{ pulp_container_content_wait | bool }}"
+  include_tasks: process_content.yml
   loop: "{{ pulp_container_content }}"
-  register: pulp_container_content_result
-
-- name: Wait for tasks to complete
-  pulp.squeezer.task:
-    pulp_url: "{{ pulp_url }}"
-    username: "{{ pulp_username }}"
-    password: "{{ pulp_password }}"
-    validate_certs: "{{ pulp_validate_certs | bool }}"
-    pulp_href: "{{ content_result.task.pulp_href }}"
-    state: "completed"
-  loop: "{{ pulp_container_content }}"
-  when:
-    - not pulp_container_content_wait | bool
-    - "'task' in content_result"
-  changed_when: pulp_container_content_wait_result.task.created_resources | default([]) | length > 0
-  register: pulp_container_content_wait_result
   loop_control:
-    index_var: result_index
-  vars:
-    content_result: "{{ pulp_container_content_result.results[result_index] }}"
+    loop_var: content_item