From 338f3b4e556dadfc4e299d6842b8499e6fd78883 Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Fri, 17 Jan 2020 17:05:17 +1100 Subject: [PATCH] ITOPSENG-395 adding defaults based on PR feedback --- roles/product_install/defaults/main.yml | 2 ++ roles/product_install/tasks/main.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index 6a9940e..ceba1b4 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -37,3 +37,5 @@ atl_servicedesk_url_map: atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | default(atl_servicedesk_url_map['default']) }}" atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr" + +force_version_update: false \ No newline at end of file diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index 6194164..1907a63 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -76,8 +76,8 @@ - name: "Case: No cached version, or supplied is higher; use supplied" set_fact: atl_download_version: "{{ atl_product_version }}" - when: (force_version_update is defined and force_version_update | bool) or - (not cached.stat.exists) or + when: force_version_update | bool or + not cached.stat.exists or atl_product_version is version(atl_cached_version, '>') - name: "Case: Cached version is higher or forced, ignore supplied" @@ -85,7 +85,7 @@ atl_download_version: "{{ atl_cached_version }}" when: cached.stat.exists and atl_product_version is version(atl_cached_version, '<=') and - (not force_version_update is defined or not force_version_update | bool) + not force_version_update | bool when: not version_is_latest