From 437fc9920d914153b95bf7c2215281db8fa540b8 Mon Sep 17 00:00:00 2001 From: Chris Hambridge Date: Thu, 30 Nov 2017 16:16:13 -0500 Subject: [PATCH] resolve brms issue when eap_home_candidates is empty. Closes #496. --- roles/brms/tasks/main.yml | 16 ++++++++++++---- roles/jboss_eap/tasks/main.yml | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/roles/brms/tasks/main.yml b/roles/brms/tasks/main.yml index bd080f6..57a25dd 100644 --- a/roles/brms/tasks/main.yml +++ b/roles/brms/tasks/main.yml @@ -16,13 +16,21 @@ when: 'have_locate and "jboss.brms" in facts_to_collect' # Combine the above with any EAP_HOME directories we've found + - name: create list if eap_home_candidates is not empty + set_fact: + business_central_candidates_eap: "{{ [] }}" + kie_server_candidates_eap: "{{ [] }}" + when: '"jboss.brms" in facts_to_collect' + - name: create list if eap_home_candidates is not empty + set_fact: + business_central_candidates_eap: "{{ eap_home_candidates | zip_longest([], fillvalue='/standalone/deployments/business-central.war') | map('join') | list }}" + kie_server_candidates_eap: "{{ eap_home_candidates | zip_longest([], fillvalue='/standalone/deployments/kie-server.war') | map('join') | list }}" + when: 'eap_home_candidates is defined and "jboss.brms" in facts_to_collect' - name: combine special directory candidates into single list set_fact: - business_central_candidates: "{{ (jboss_brms_business_central_candidates.get('stdout_lines', []) + - (eap_home_candidates | map('format', '%s/standalone/deployments/business-central.war') | list)) | unique }}" - kie_server_candidates: "{{ (jboss_brms_kie_server_candidates.get('stdout_lines', []) + - (eap_home_candidates | map('format', '%s/standalone/deployments/kie-server.war') | list)) | unique }}" + business_central_candidates: "{{ jboss_brms_business_central_candidates.get('stdout_lines', []) + business_central_candidates_eap | unique }}" + kie_server_candidates: "{{ jboss_brms_kie_server_candidates.get('stdout_lines', []) + kie_server_candidates_eap | unique }}" when: '"jboss.brms" in facts_to_collect' - name: cat MANIFEST.MF files diff --git a/roles/jboss_eap/tasks/main.yml b/roles/jboss_eap/tasks/main.yml index 898a616..e84bcec 100644 --- a/roles/jboss_eap/tasks/main.yml +++ b/roles/jboss_eap/tasks/main.yml @@ -9,7 +9,7 @@ when: 'have_java and ("jboss.eap.running-paths" in facts_to_collect or "jboss.eap.eap-home" in facts_to_collect or "jboss.fuse.fuse-on-eap" in facts_to_collect)' - name: use locate to look for jboss-modules.jar - raw: locate jboss-modules.jar | xargs -n 1 dirname + raw: locate jboss-modules.jar | xargs -n 1 dirname 2> /dev/null register: jboss_eap_locate_jboss_modules_jar ignore_errors: yes when: 'have_locate and ("jboss.eap.locate-jboss-modules-jar" in facts_to_collect or "jboss.eap.eap-home" in facts_to_collect or "jboss.fuse.fuse-on-eap" in facts_to_collect)'