cruise_control: fix RHN download

ansible-middleware · Jan 18, 2024 · 650897c · 650897c
1 parent b90018f
commit 650897c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/roles/amq_streams_common/tasks/rhn/main.yml b/roles/amq_streams_common/tasks/rhn/main.yml
@@ -18,7 +18,7 @@
   ansible.builtin.set_fact:
     rhn_product_archive_file_pattern: '^.*/amq-streams-[0-9.]*-bin.zip$'
   when:
-    - not rhn_product_archive_file_pattern is defined or rhn_product_archive_file_pattern == ""
+    - not rhn_product_archive_file_pattern is defined or rhn_product_archive_file_pattern | length < 1
 
 - name: "Determine which archive to download using file pattern: {{ rhn_product_archive_file_pattern }}."
   ansible.builtin.set_fact:

diff --git a/roles/amq_streams_cruise_control/tasks/main.yml b/roles/amq_streams_cruise_control/tasks/main.yml
@@ -14,6 +14,8 @@
   ansible.builtin.include_role:
     name: amq_streams_common
     tasks_from: rhn/main.yml
+  vars:
+    rhn_product_archive_file_pattern: "{{ amq_streams_cruise_control_rhn_product_archive_file_pattern }}"
 
 - name: "Ensure Cruise Control artifacts is properly installed."
   ansible.builtin.include_role: