From dae679aaf3e7a3b4d517242e6330ef44d5681c10 Mon Sep 17 00:00:00 2001 From: Philip Frank Date: Thu, 2 Apr 2020 09:49:23 +0200 Subject: [PATCH 1/2] set springboot_src_file and springboot_src_url to empty string by default, no longer depend on yaml special treatment of "None" --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a59a38b..f808902 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,8 +4,8 @@ springboot_java_install: true # Mandatory variable : path to springboot jar to deploy. # Either specify a file or a url depending on if you want to copy you app or download it. -springboot_src_file: -springboot_src_url: None +springboot_src_file: '' +springboot_src_url: '' # Mandatory variable : spring boot application name springboot_application_name: From 48e6fdfed272a30656898d420ce70247400de4e3 Mon Sep 17 00:00:00 2001 From: Philip Frank Date: Thu, 2 Apr 2020 09:55:11 +0200 Subject: [PATCH 2/2] change `version_compare` to `version` for compatibility with ansible 2.5 --- tasks/service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/service.yml b/tasks/service.yml index f9e3cb0..eebd8b0 100644 --- a/tasks/service.yml +++ b/tasks/service.yml @@ -1,6 +1,6 @@ --- - name: "Check if use systemd" - set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version | version_compare('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version | version_compare('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('15', '>=')) }} + set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version is version('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('15', '>=')) }} - name: "Ensure systemd system directory is present (for Ubuntu)" file: