Merge branch 'devel' into fix_diff_plugin

redhat-cop · Nov 19, 2023 · c9891b0 · c9891b0
2 parents de56266 + 0609b69
commit c9891b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugins/lookup/controller_object_diff.py b/plugins/lookup/controller_object_diff.py
@@ -336,7 +336,7 @@ def run(self, terms, variables=None, **kwargs):
 
         # Combine Lists
         if self.get_option("with_present"):
-            for item in compare_list_reduced:
+            for item in compare_list:
                 item.update({"state": "present"})
             compare_list.extend(difference)
             # Return Compare list with difference attached

diff --git a/roles/license/tasks/main.yml b/roles/license/tasks/main.yml
@@ -4,7 +4,7 @@
 - name: Use manifest file
   ansible.builtin.include_tasks: "manifest.yml"
   when:
-    - controller_license.manifest_file is defined or controller_license.manifest is defined or controller_license.manifest_content is defined
+    - controller_license.manifest_file is defined or controller_license.manifest is defined or controller_license.manifest_content is defined or controller_license.manifest_url is defined
 
 - name: Use subscription pool id or subscription lookup
   ansible.builtin.include_tasks: "subscription.yml"

diff --git a/tests/configs/differential_items.yml b/tests/configs/differential_items.yml
@@ -45,20 +45,20 @@ differential_items:
         organization: Default
         scm_type: git
         scm_url: https://github.com/ansible/tower-example.git
-        # state: present
+        state: present
       - description: ansible-examples
         name: Test Inventory source project
         organization: Default
         scm_type: git
         scm_url: https://github.com/ansible/ansible-examples.git
-        # state: present
+        state: present
       - credential: gitlab-personal-access-token for satqe_auto_droid
         description: ansible-examples
         name: Test Inventory source project with credential
         organization: Default
         scm_type: git
         scm_url: https://github.com/ansible/ansible-examples.git
-        # state: present
+        state: present
         wait: false
       - description: Test Project 1
         name: Test Project
@@ -67,7 +67,7 @@ differential_items:
         scm_clean: true
         scm_type: git
         scm_url: https://github.com/ansible/tower-example.git
-        # state: present
+        state: present
       - name: Demo Project
         organization: Default
         state: absent