From 912514c326caee96378c54f40ea30e6088229c58 Mon Sep 17 00:00:00 2001 From: Hayden Seitz Date: Thu, 8 Jun 2023 12:32:45 -0700 Subject: [PATCH 1/5] fix: Install systemd-udev in Dockerfile.j2 Creates /etc/sysctl.d --- molecule/default/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 index 96ce967..1b8b28b 100644 --- a/molecule/default/Dockerfile.j2 +++ b/molecule/default/Dockerfile.j2 @@ -4,6 +4,6 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install --no-install-recommends -y net-tools procps python3 python3-apt && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf install -y net-tools procps-ng && dnf clean all; \ - elif [ $(command -v yum) ]; then yum install -y net-tools procps-ng && yum clean all; fi +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install --no-install-recommends -y net-tools procps systemd-udev python3 python3-apt && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf install -y net-tools procps-ng systemd-udev && dnf clean all; \ + elif [ $(command -v yum) ]; then yum install -y net-tools procps-ng systemd-udev && yum clean all; fi From 4ea0406a19b9515bf13dd86e28291aec65372c1f Mon Sep 17 00:00:00 2001 From: Hayden Seitz Date: Thu, 8 Jun 2023 12:42:09 -0700 Subject: [PATCH 2/5] fix: only install systemd-udev for RHEL --- molecule/default/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 index 1b8b28b..b0a5f43 100644 --- a/molecule/default/Dockerfile.j2 +++ b/molecule/default/Dockerfile.j2 @@ -4,6 +4,6 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install --no-install-recommends -y net-tools procps systemd-udev python3 python3-apt && apt-get clean; \ +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install --no-install-recommends -y net-tools procps python3 python3-apt && apt-get clean; \ elif [ $(command -v dnf) ]; then dnf install -y net-tools procps-ng systemd-udev && dnf clean all; \ elif [ $(command -v yum) ]; then yum install -y net-tools procps-ng systemd-udev && yum clean all; fi From f0bb09b481b59e51b9c320622689670c853fdafc Mon Sep 17 00:00:00 2001 From: Hayden Seitz Date: Thu, 8 Jun 2023 12:47:26 -0700 Subject: [PATCH 3/5] docs: replace build status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b77a1c..4c36164 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ansible HAproxy (OpenStack ready) -[![Build Status](https://travis-ci.com/uoi-io/ansible-haproxy.svg?branch=master)](https://travis-ci.com/uoi-io/ansible-haproxy) [![Ansible Galaxy](https://img.shields.io/badge/galaxy-uoi.haproxy-green.svg?style=flat)](https://galaxy.ansible.com/uoi-io/haproxy/) +[![CI](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml/badge.svg)](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml) This role provides support for the installation of HAproxy on current distributions: From 6b10c431d57d43390179b46598c4896b7e369d8d Mon Sep 17 00:00:00 2001 From: Hayden Seitz Date: Thu, 8 Jun 2023 12:55:25 -0700 Subject: [PATCH 4/5] docs: update list of supported distros --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4c36164..f7615df 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,10 @@ This role provides support for the installation of HAproxy on current distributions: -- CentOS **7.x** / **8.x** -- RedHat **7.x** / Not tested on **8.x** but should work -- Fedora **33** / **34** -- Debian **9.x** / **10.x** / **11.x** -- Ubuntu **18.04** / **20.04** +- Rocky Linux **8** / **9** +- Fedora **37** / **38** / **39** +- Debian **10** / **11** +- Ubuntu **18.04** / **20.04** / **22.04** The role allows you to configure multiple sections of HAproxy: From 1f13719a810c5124087d1706c59ddbfe3370b22c Mon Sep 17 00:00:00 2001 From: Hayden Seitz Date: Thu, 8 Jun 2023 12:57:26 -0700 Subject: [PATCH 5/5] fix: re-add Ansible Galaxy badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7615df..96ef728 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ansible HAproxy (OpenStack ready) -[![CI](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml/badge.svg)](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml) +[![CI](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml/badge.svg)](https://github.com/uoi-io/ansible-haproxy/actions/workflows/ci.yml) [![Ansible Galaxy](https://img.shields.io/badge/galaxy-uoi.haproxy-green.svg?style=flat)](https://galaxy.ansible.com/uoi-io/haproxy/) This role provides support for the installation of HAproxy on current distributions: