From 6eca144387031830d7d08094da46600202c5d99c Mon Sep 17 00:00:00 2001 From: Glenn Stewart Date: Thu, 16 Jun 2022 11:36:06 +1000 Subject: [PATCH] ITSD-94667 Change boolean style using only one test for logic --- roles/product_install/defaults/main.yml | 1 - roles/product_install/tasks/jira-servicedesk_as_obr.yml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index b9f7dbd..d768e62 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -38,7 +38,6 @@ atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | atl_install_jsd_as_obr: false atl_source_obr_from_marketplace: true -atl_source_obr_from_url: false atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr" force_version_update: false diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml index 41cb16b..c634da2 100644 --- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml +++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml @@ -3,7 +3,6 @@ - name: Check for alternate obr download url set_fact: atl_source_obr_from_marketplace: false - atl_source_obr_from_url: true when: - atl_obr_download_url is defined @@ -48,7 +47,7 @@ atl_obr_filename: "jira-servicedesk-application-{{ atl_jsd_build }}.obr" when: - - atl_source_obr_from_marketplace + - atl_source_obr_from_marketplace | bool - name: Source jira-servicedesk obr from alternate url block: @@ -65,7 +64,7 @@ debug: msg="atl_jsd_build={{ atl_jsd_build }}" when: - - atl_source_obr_from_url + - not atl_source_obr_from_marketplace | bool - name: is shared_home set ? debug: