Merge pull request #60 from stackhpc/container-content-wait

pulp_container_content: Allow not waiting for content changes

Author: markgoddard

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: "stackhpc"
 name: "pulp"
-version: "0.5.0"
+version: "0.5.1"
 readme: "README.md"
 authors:
   - "Piotr Parczewski"

plugins/modules/pulp_container_content.py

@@ -137,13 +137,17 @@ def add_or_remove(self, add_or_remove_id, content_units):
                 add_or_remove_id, body=body, uploads=self.uploads, parameters=parameters
             )
             if response and "task" in response:
-                task = PulpTask(self.module, {"pulp_href": response["task"]}).wait_for()
-                # Adding or removing content results in creation of a new repository version
-                if task["created_resources"]:
-                    self.entity = {"pulp_href": task["created_resources"][0]}
-                    self.module.set_changed()
+                if self.module.params["wait"]:
+                    task = PulpTask(self.module, {"pulp_href": response["task"]}).wait_for()
+                    # Adding or removing content results in creation of a new repository version
+                    if task["created_resources"]:
+                        self.entity = {"pulp_href": task["created_resources"][0]}
+                        self.module.set_changed()
+                    else:
+                        self.entity = None
                 else:
-                    self.entity = None
+                    self._name_singular = "task"
+                    self.entity = {"pulp_href": response["task"]}
             else:
                 self.entity = response
         else:
@@ -178,6 +182,7 @@ def main():
             src_is_push={"type": "bool", "default": False},
             state={"default": "present"},
             tags={"type": "list", "item": "str", "required": True},
+            wait={"type": "bool", "default": True},
         ),
         required_if=[("state", "present", ["src_repo"])],
     ) as module:

roles/pulp_container_content/README.md

@@ -23,6 +23,8 @@ Role variables
   * `state`: Whether to add (`present`) or remove (`absent`) content.
   * `tags`: List of names of tags to add or remove.
 
+* `pulp_container_content_wait`: Whether to wait for content addition to complete in order. Default is `true`.
+
 Example playbook
 ----------------
 

roles/pulp_container_content/defaults/main.yml

@@ -5,3 +5,4 @@ pulp_password:
 pulp_validate_certs: true
 
 pulp_container_content: []
+pulp_container_content_wait: true

roles/pulp_container_content/tasks/main.yml

@@ -11,4 +11,25 @@
     repository: "{{ item.repository }}"
     tags: "{{ item.tags }}"
     state: "{{ item.state | default(omit) }}"
+    wait: "{{ pulp_container_content_wait | bool }}"
   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] }}"

tests/test_container_content.yml

@@ -56,7 +56,7 @@
         that:
           - tags.json.results | map(attribute='name') | sort | list == ['manifest_a', 'manifest_b']
 
-    # Test idempotence
+    # Test idempotence and not waiting
     - include_role:
         name: pulp_container_content
       vars:
@@ -67,6 +67,7 @@
               - manifest_a
               - manifest_b
             state: present
+        pulp_container_content_wait: false
 
     - include_role:
         name: pulp_container_content
@@ -111,6 +112,7 @@
             tags:
               - manifest_b
             state: absent
+        pulp_container_content_wait: false
 
     - include_role:
         name: pulp_container_content