From ac66ede6773b67f667bb0f8cd2e1b0d962b33b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Wed, 19 Jun 2019 17:46:53 +0200 Subject: [PATCH] Handle Ubuntu >= 18 --- apt/tasks/main.yml | 4 ++-- evolinux-base/tasks/main.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apt/tasks/main.yml b/apt/tasks/main.yml index b02e779f..a57a33bd 100644 --- a/apt/tasks/main.yml +++ b/apt/tasks/main.yml @@ -2,9 +2,9 @@ - name: "Compatibility check" fail: - msg: only compatible with Debian >= 8 + msg: only compatible with Debian >= 8 AND Ubuntu >= 18.04 when: - - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') + - (ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')) and (ansible_distribution != "Ubuntu" or ansible_distribution_major_version | version_compare('18', '<')) tags: - apt diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index ff0213a8..6d0a0f9b 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -3,9 +3,9 @@ - name: "System compatibility checks" assert: that: - - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('8', '>=') - msg: only compatible with Debian >= 8 + - (ansible_distribution == "Debian") or (ansible_distribution == "Ubuntu") + - (ansible_distribution_major_version | version_compare('8', '>=')) or (ansible_distribution_major_version | version_compare('18', '>=')) + msg: only compatible with Debian >= 8 AND Ubuntu >= 18.04 - name: Apt configuration include_role: