From 2587ad7e618f1b1eb2374c93a9b825d44235fb52 Mon Sep 17 00:00:00 2001
From: Norman Ziegner <n.ziegner@hzdr.de>
Date: Sun, 26 May 2024 13:07:28 +0200
Subject: [PATCH] Support HAProxy 2.8

Signed-off-by: Norman Ziegner <n.ziegner@hzdr.de>
---
 molecule/haproxy/molecule.yml | 23 +++++++++++++++++------
 roles/haproxy/README.md       |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/molecule/haproxy/molecule.yml b/molecule/haproxy/molecule.yml
index 7b2c55d..66ae96e 100644
--- a/molecule/haproxy/molecule.yml
+++ b/molecule/haproxy/molecule.yml
@@ -9,14 +9,21 @@ dependency:
 driver:
   name: "podman"
 platforms:
-  - name: "instancehaproxy1"
+  - name: "haproxy_v2.8"
     image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
     pre_build_image: true
     privileged: true
     override_command: false
     systemd: true
     tty: true
-  - name: "instancehaproxy2"
+  - name: "haproxy_v2.6"
+    image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
+    pre_build_image: true
+    privileged: true
+    override_command: false
+    systemd: true
+    tty: true
+  - name: "haproxy_v2.4"
     image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
     pre_build_image: true
     privileged: true
@@ -31,15 +38,19 @@ provisioner:
         vars:
           haproxy_ssl_dhparam_size: 512
     host_vars:
-      instancehaproxy1:
+      haproxy_v2.8:
         haproxy_create_self_signed_cert: true
-        haproxy_ppa_version: "ppa:vbernat/haproxy-2.4"
-        haproxy_version: "2.4.*"
-      instancehaproxy2:
+        haproxy_ppa_version: "ppa:vbernat/haproxy-2.8"
+        haproxy_version: "2.8.*"
+      haproxy_v2.6:
         haproxy_create_self_signed_cert: false
         haproxy_ssl_cert_chain_src_file_path: "{{ (lookup('env', 'MOLECULE_SCENARIO_DIRECTORY'), 'test.pem') | path_join }}"
         haproxy_ppa_version: "ppa:vbernat/haproxy-2.6"
         haproxy_version: "2.6.*"
+      haproxy_v2.4:
+        haproxy_create_self_signed_cert: true
+        haproxy_ppa_version: "ppa:vbernat/haproxy-2.4"
+        haproxy_version: "2.4.*"
   playbooks:
     prepare: "prepare.yml"
     check: "converge.yml"
diff --git a/roles/haproxy/README.md b/roles/haproxy/README.md
index f5cab33..5ff4b88 100644
--- a/roles/haproxy/README.md
+++ b/roles/haproxy/README.md
@@ -20,6 +20,7 @@ Currently [supported platforms](meta/main.yml) are:
 This role is tested against the two latest LTS versions of HAProxy.
 Currently, this results in official support for the HAProxy release series:
 
+- `2.8`
 - `2.6`
 - `2.4`