From f8f3cec9c2d65431e25ad1760597b2301706499a Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Fri, 17 Jan 2020 15:22:18 +1100 Subject: [PATCH] ITOPSENG-395 adjusting conditionals --- roles/product_install/tasks/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index ecec6c4..d595495 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -73,18 +73,19 @@ - name: "Case: Version is not latest" block: - - name: "Case: No cached version, or but supplied is higher or forced; use supplied" + - 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: (not cached.stat.exists) or atl_product_version is version(atl_cached_version, '>') - - name: "Case: Cached version is higher, ignore supplied" + - name: "Case: Cached version is higher or forced, ignore supplied" set_fact: atl_download_version: "{{ atl_cached_version }}" - when: cached.stat.exists and - atl_product_version is version(atl_cached_version, '<=') + when: + - cached.stat.exists + - atl_product_version is version(atl_cached_version, '<=') + - (not force_version_update is defined or not force_version_update | bool) when: not version_is_latest