Skip to content

Commit

Permalink
Remove the restriction for HAproxy 3.0 under Ubuntu 20.04
Browse files Browse the repository at this point in the history
Signed-off-by: Norman Ziegner <n.ziegner@hzdr.de>
  • Loading branch information
Normo committed Nov 5, 2024
1 parent 91a9193 commit f52b55e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 1 addition & 3 deletions molecule/haproxy/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/haproxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions roles/haproxy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f52b55e

Please sign in to comment.