From f52b55e455da7a00892fb4073fde826fe2bbf5a5 Mon Sep 17 00:00:00 2001 From: Norman Ziegner Date: Tue, 5 Nov 2024 16:09:33 +0100 Subject: [PATCH] Remove the restriction for HAproxy 3.0 under Ubuntu 20.04 Signed-off-by: Norman Ziegner --- molecule/haproxy/verify.yml | 4 +--- roles/haproxy/README.md | 2 +- roles/haproxy/tasks/main.yml | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/molecule/haproxy/verify.yml b/molecule/haproxy/verify.yml index 99a16594..3d1437cf 100644 --- a/molecule/haproxy/verify.yml +++ b/molecule/haproxy/verify.yml @@ -15,9 +15,7 @@ - name: "Stop play for unsupported HAProxy / Ubuntu combinations" ansible.builtin.meta: "end_host" - when: >- - ansible_facts.distribution_release | lower == 'focal' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '>') or - ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<') + when: "ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')" - name: "Populate service facts." ansible.builtin.service_facts: diff --git a/roles/haproxy/README.md b/roles/haproxy/README.md index e4c533f0..185d52f3 100644 --- a/roles/haproxy/README.md +++ b/roles/haproxy/README.md @@ -23,7 +23,7 @@ Currently [supported platforms](meta/main.yml) are: This role is tested against the four latest LTS versions of HAProxy. Currently, this results in official support for the HAProxy release series: -- `3.0` (not supported on Ubuntu 20.04) +- `3.0` - `2.8` (not supported on Ubuntu 24.04) - `2.6` (not supported on Ubuntu 24.04) - `2.4` (not supported on Debian 12 and Ubuntu 24.04) diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index 762799dd..3810fbb8 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -22,9 +22,7 @@ - name: "Stop role for unsupported HAProxy / Ubuntu combinations" ansible.builtin.meta: "end_host" - when: >- - ansible_facts.distribution_release | lower == 'focal' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '>') or - ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<') + when: "ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')" - name: "Enable ip_forward." become: true