From 650897c5f8ac4f78e8e7f6342889b40522ae322c Mon Sep 17 00:00:00 2001 From: Romain Pelisse Date: Wed, 17 Jan 2024 17:46:24 +0100 Subject: [PATCH] cruise_control: fix RHN download --- roles/amq_streams_common/tasks/rhn/main.yml | 2 +- roles/amq_streams_cruise_control/tasks/main.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/amq_streams_common/tasks/rhn/main.yml b/roles/amq_streams_common/tasks/rhn/main.yml index d2ae824..0d7d9ea 100644 --- 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 index 9b33610..8cfe05d 100644 --- 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: