Merge pull request #433 from Normo/haproxy-3.2

Install HAProxy 3.2 by default

Author: Normo

molecule/haproxy/molecule.yml

@@ -9,6 +9,13 @@ dependency:
 driver:
   name: "podman"
 platforms:
+  - name: "haproxy_v3.2"
+    image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
+    pre_build_image: true
+    privileged: true
+    override_command: false
+    systemd: true
+    tty: true
   - name: "haproxy_v3.0"
     image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
     pre_build_image: true
@@ -45,6 +52,10 @@ provisioner:
         vars:
           haproxy_ssl_dhparam_size: 512
     host_vars:
+      haproxy_v3.2:
+        haproxy_create_self_signed_cert: true
+        haproxy_ppa_version: "ppa:vbernat/haproxy-3.2"
+        haproxy_version: "3.2.*"
       haproxy_v3.0:
         haproxy_create_self_signed_cert: true
         haproxy_ppa_version: "ppa:vbernat/haproxy-3.0"

molecule/haproxy/verify.yml

@@ -11,11 +11,14 @@
       ansible.builtin.meta: "end_host"
       when: >-
         ansible_facts.distribution_release | lower == 'bookworm' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.4', '==') or
+        ansible_facts.distribution_release | lower == 'bullseye' and haproxy_version | regex_search('\\d+\\.\\d+') is version('3.2', '>=') or
         ansible_facts.distribution_release | lower == 'buster' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.8', '>=')
 
     - name: "Stop play for unsupported HAProxy / Ubuntu combinations"
       ansible.builtin.meta: "end_host"
-      when: "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', '<') or
+        ansible_facts.distribution_release | lower != 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('3.2', '>=')
 
     - name: "Populate service facts."
       ansible.builtin.service_facts:

roles/haproxy/README.md

@@ -121,15 +121,15 @@ haproxy_executable_path: '/usr/sbin/haproxy'
 Variable to pin the PPA version to a certain value:
 
 ```yaml
-haproxy_ppa_version: 'ppa:vbernat/haproxy-3.0'
+haproxy_ppa_version: 'ppa:vbernat/haproxy-3.2'
 ```
 
 #### HAProxy version
 
 Variable to pin the HAProxy version to a certain value:
 
 ```yaml
-haproxy_version: '3.0.*'
+haproxy_version: '3.2.*'
 ```
 
 #### HAProxy user

roles/haproxy/defaults/main.yml

@@ -7,9 +7,9 @@
 # Path to the executable of HAProxy
 haproxy_executable_path: "/usr/sbin/haproxy"
 # HAProxy PPA version
-haproxy_ppa_version: "ppa:vbernat/haproxy-3.0"
+haproxy_ppa_version: "ppa:vbernat/haproxy-3.2"
 # HAProxy version
-haproxy_version: "3.0.*"
+haproxy_version: "3.2.*"
 # HAProxy user
 haproxy_user: "haproxy"
 # HAProxy group

roles/haproxy/tasks/main.yml

@@ -18,11 +18,14 @@
   ansible.builtin.meta: "end_host"
   when: >-
     ansible_facts.distribution_release | lower == 'bookworm' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.4', '==') or
+    ansible_facts.distribution_release | lower == 'bullseye' and haproxy_version | regex_search('\\d+\\.\\d+') is version('3.2', '>=') or
     ansible_facts.distribution_release | lower == 'buster' and haproxy_version | regex_search('\\d+\\.\\d+') is version('2.8', '>=')
 
 - name: "Stop role for unsupported HAProxy / Ubuntu combinations"
   ansible.builtin.meta: "end_host"
-  when: "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', '<') or
+    ansible_facts.distribution_release | lower != 'noble' and haproxy_version | regex_search('\\d+\\.\\d+') is version('3.2', '>=')
 
 - name: "Enable ip_forward."
   become: true