From 04b9582ea76c3b7a7de3ed046996977eed7bfe2c Mon Sep 17 00:00:00 2001 From: dmosen Date: Sat, 16 Dec 2023 12:07:36 +0100 Subject: [PATCH 1/3] Support el9 in rabbitmq setup --- .../jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml index 5ad1955d..e58e0d32 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/RedHat.yml @@ -5,6 +5,8 @@ el7 {%- elif linux_distro in ['centos8','redhat8'] -%} el8 + {%- elif linux_distro in ['centos9','redhat9'] -%} + el9 {%- endif -%} - name: Find socat package From f189b4618974b8b1719aa00090dc5ecb3e677072 Mon Sep 17 00:00:00 2001 From: dmosen Date: Sat, 16 Dec 2023 13:47:31 +0100 Subject: [PATCH 2/3] Add el9 support also for upgrades --- .../jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml index 4ca12dfc..3b08d862 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/upgrade/RedHat.yml @@ -5,6 +5,8 @@ el7 {%- elif linux_distro in ['centos8','redhat8'] -%} el8 + {%- elif linux_distro in ['centos9','redhat9'] -%} + el9 {%- endif -%} - name: Find erlang package From 5d68806979b901b51daeb06420573f4e90ae1e80 Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Mon, 13 May 2024 09:43:04 +0530 Subject: [PATCH 3/3] [ansible] JFrog Platform 10.18.0 release --- Ansible/ansible_collections/jfrog/platform/CHANGELOG.md | 6 +++++- Ansible/ansible_collections/jfrog/platform/README.md | 4 +++- Ansible/ansible_collections/jfrog/platform/galaxy.yml | 2 +- .../jfrog/platform/roles/artifactory/defaults/main.yml | 6 +++++- .../jfrog/platform/roles/artifactory/vars/main.yml | 2 +- .../jfrog/platform/roles/distribution/vars/main.yml | 2 +- .../jfrog/platform/roles/insight/vars/main.yml | 2 +- .../jfrog/platform/roles/xray/defaults/main.yml | 2 +- .../jfrog/platform/roles/xray/vars/main.yml | 2 +- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index 1cc7bc8e..5c8ed437 100644 --- a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md +++ b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md @@ -1,6 +1,11 @@ # JFrog Platform Ansible Collection Changelog All changes to this collection will be documented in this file. +## [10.18.0] - May 12, 2024 +* Product Updates/fixes +* Added a new variable `artifactory_allowNonPostgresql` (default false) in systemYaml to run Artifactory with any database other than PostgreSQL +* Xray - Support RHEL 9 in rabbitmq setup [GH-354](https://github.com/jfrog/JFrog-Cloud-Installers/pull/354) + ## [10.17.4] - May 2, 2024 * Product Updates/fixes @@ -13,7 +18,6 @@ All changes to this collection will be documented in this file. ## [10.17.1] - Feb 29, 2024 * Artifactory - Upgrade fails during the Check artifactory version [GH-369](https://github.com/jfrog/JFrog-Cloud-Installers/pull/369) -* Product Updates/fixes ## [10.17.0] - Jan 24, 2024 * **IMPORTANT** diff --git a/Ansible/ansible_collections/jfrog/platform/README.md b/Ansible/ansible_collections/jfrog/platform/README.md index 37e81df5..8bee90bb 100644 --- a/Ansible/ansible_collections/jfrog/platform/README.md +++ b/Ansible/ansible_collections/jfrog/platform/README.md @@ -142,11 +142,13 @@ The JFrog Platform Ansible Collection can be installed on the following operatin * Ubuntu LTS versions (20.04/22.04) * Centos/RHEL 8.x/9.x * Debian 10.x/11.x +* Amazon Linux 2 ## Note -From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x and Amazon Linux 2 +* From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x +* From 10.18.x platform collection , It is recommended to use Postgresql 15 for fresh installations , Change `postgres_version : 15` in postgres/defaults/vars.yaml ## How to avoid IPv6 binding diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index dc948e56..cddb67c1 100644 --- a/Ansible/ansible_collections/jfrog/platform/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/platform/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "platform" # The version of the collection. Must be compatible with semantic versioning -version: "10.17.4" +version: "10.18.0" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: "README.md" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml index b5ec093a..9fe0e702 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml @@ -1,7 +1,7 @@ # Defaults file for artifactory # The version of artifactory to install -artifactory_version: 7.77.11 +artifactory_version: 7.84.10 # Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role ) artifactory_nginx_ssl_enabled: false @@ -64,6 +64,9 @@ artifactory_gid: 1030 # If this is an upgrade artifactory_upgrade_only: false +# To run Artifactory with any database other than PostgreSQL, allowNonPostgresql set to true +artifactory_allowNonPostgresql: false + # Default username and password, uncomment and change to manage with ansible # artifactory_admin_username: admin # artifactory_admin_password: password @@ -83,6 +86,7 @@ artifactory_systemyaml: |- taskAffinity: {{ artifactory_taskaffinity }} haEnabled: {{ artifactory_ha_enabled }} database: + allowNonPostgresql: {{ artifactory_allowNonPostgresql }} type: "{{ artifactory_db_type }}" driver: "{{ artifactory_db_driver }}" url: "{{ artifactory_db_url }}" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml index bfc31c3f..86beeb18 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.4 +platform_collection_version: 10.18.0 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml index d8a7822f..a4909f78 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.4 +platform_collection_version: 10.18.0 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml index d8a7822f..a4909f78 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.4 +platform_collection_version: 10.18.0 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml index 01d37b0c..d0f42373 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml @@ -1,7 +1,7 @@ # Defaults file for xray # The version of xray to install -xray_version: 3.94.5 +xray_version: 3.94.6 # Whether to enable HA xray_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml index d8a7822f..a4909f78 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.4 +platform_collection_version: 10.18.0 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy