From 6fe091a7620f8a9b89f502fefb3d14de45127a5d Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Sun, 28 Jul 2024 21:11:55 +0200 Subject: [PATCH 1/2] chore: Remove platform metadata from the Ansible Galaxy role metadata --- .ansible-lint | 1 - CHANGELOG.md | 2 ++ README.md | 2 +- meta/main.yml | 20 +------------------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 04a344e1..27105069 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -3,5 +3,4 @@ offline: true exclude_paths: - .github/ skip_list: - - schema[meta] - yaml[line-length] diff --git a/CHANGELOG.md b/CHANGELOG.md index 34bd91df..5d43c0dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ CI/CD: - Add Molecule tests covering common NGINX use cases (web server, reverse proxy), enabling the NGINX stub status metrics, and NGINX Plus API and live metrics dashboard. - Update the platforms used in the various Molecule scenarios. - Use the local role name (`ansible-role-nginx-config`) instead of the fully qualified role name (`nginxinc.nginx_config`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand. +- Bump the minimum version of Ansible supported on Ansible Galaxy to `2.16`. +- Remove platform metadata from the Ansible Galaxy role metadata since platforms are no longer supported in Ansible Galaxy NG. ## 0.7.1 (October 3rd, 2023) diff --git a/README.md b/README.md index b71d8774..fcc3bb0e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ This role configures NGINX Open Source and NGINX Plus on your target host. ### Ansible -- This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`). +- This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.16`). - When using Ansible core, you will also need to install the following collections: ```yaml diff --git a/meta/main.yml b/meta/main.yml index a956e583..658c5450 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -7,25 +7,7 @@ galaxy_info: license: Apache License, Version 2.0 - min_ansible_version: '2.12' - - platforms: - - name: Alpine - versions: [all] - - name: Amazon Linux - versions: ['2', '2023'] - - name: Debian - versions: [bullseye, bookworm] - - name: EL - versions: ['7', '8', '9'] - - name: FreeBSD - versions: ['12.1', '12.2', '12.3', '12.4', '13.0', '13.1', '13.2'] - - name: OracleLinux - versions: ['7', '8', '9'] - - name: Ubuntu - versions: [focal, jammy, kinetic, lunar] - - name: SLES - versions: ['12', '15'] + min_ansible_version: '2.16' galaxy_tags: - nginx From b9b27a4bf1561f2ffaa85421a547ed8fef602865 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Sun, 28 Jul 2024 21:15:30 +0200 Subject: [PATCH 2/2] Update plus_requirements.yml --- molecule/common/requirements/plus_requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/common/requirements/plus_requirements.yml b/molecule/common/requirements/plus_requirements.yml index 4102e3e8..0affec7c 100644 --- a/molecule/common/requirements/plus_requirements.yml +++ b/molecule/common/requirements/plus_requirements.yml @@ -3,4 +3,4 @@ roles: - name: nginxinc.nginx version: 0.24.0 - name: nginxinc.nginx_app_protect - version: 0.9.0 + src: https://github.com/nginxinc/ansible-role-nginx-app-protect