Skip to content

Commit a9cbf3f

Browse files
authored
Merge pull request #335 from Normo/ubntu-focal-haproxy-3.0
Remove the restriction for HAproxy 3.0 under Ubuntu 20.04
2 parents 91a9193 + f52b55e commit a9cbf3f

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

molecule/haproxy/verify.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
1616
- name: "Stop play for unsupported HAProxy / Ubuntu combinations"
1717
ansible.builtin.meta: "end_host"
18-
when: >-
19-
ansible_facts.distribution_release | lower == 'focal' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '>') or
20-
ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')
18+
when: "ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')"
2119

2220
- name: "Populate service facts."
2321
ansible.builtin.service_facts:

roles/haproxy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Currently [supported platforms](meta/main.yml) are:
2323
This role is tested against the four latest LTS versions of HAProxy.
2424
Currently, this results in official support for the HAProxy release series:
2525

26-
- `3.0` (not supported on Ubuntu 20.04)
26+
- `3.0`
2727
- `2.8` (not supported on Ubuntu 24.04)
2828
- `2.6` (not supported on Ubuntu 24.04)
2929
- `2.4` (not supported on Debian 12 and Ubuntu 24.04)

roles/haproxy/tasks/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
2323
- name: "Stop role for unsupported HAProxy / Ubuntu combinations"
2424
ansible.builtin.meta: "end_host"
25-
when: >-
26-
ansible_facts.distribution_release | lower == 'focal' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '>') or
27-
ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')
25+
when: "ansible_facts.distribution_release | lower == 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.9', '<')"
2826

2927
- name: "Enable ip_forward."
3028
become: true

0 commit comments

Comments
 (0)