[ansible] JFrog Platform 10.20.2 release

jfrog · Dec 13, 2024 · 048dd6c · 048dd6c
1 parent 6804524
commit 048dd6c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 68 deletions.
diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Platform Ansible Collection Changelog
 All changes to this collection will be documented in this file.
 
+## [10.20.2] - December 12, 2024
+* Product Updates/fixes
+
 ## [10.20.1] - Nov 26, 2024
 * Postgres - Fixed auth method in pg_hba.conf file [GH-428](https://github.com/jfrog/JFrog-Cloud-Installers/pull/428)
 * Artifactory - Fixed issue around /etc/cron.allow does not exist [GH-420](https://github.com/jfrog/JFrog-Cloud-Installers/issues/420)

diff --git 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.20.1"
+version: "10.20.2"
 
 # 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
@@ -1,14 +1,11 @@
 # Defaults file for artifactory
 
 # The version of artifactory to install
-artifactory_version: 7.98.9
-
+artifactory_version: 7.98.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
-
 # Set this to false when ngnix is disabled, defaults to true (implies artifactory uses artifactory_nginx role )
 artifactory_nginx_enabled: true
-
 # Provide single or HA individual licenses file separated by new line and 2-space indentation and for HA, set artifactory_ha_enabled: true.
 # Example: Replace <license_1> , <license_2> , <license_3> with original licenses
 # artifactory_licenses: |-
@@ -20,59 +17,41 @@ artifactory_nginx_enabled: true
 
 # To enable HA, set to true
 artifactory_ha_enabled: false
-
 # By default, all nodes are primary (CNHA) - https://www.jfrog.com/confluence/display/JFROG/High+Availability#HighAvailability-Cloud-NativeHighAvailability
 artifactory_taskaffinity: any
-
 # To enable mission-control in artifactory (>= 7.27.x) applicable only on E+ license
 artifactory_mc_enabled: true
-
 # The location where Artifactory should install
 jfrog_home_directory: /opt/jfrog
-
 # Pick the Artifactory flavour to install, can be also cpp-ce/jcr/pro
 artifactory_flavour: pro
-
 # Whether to start Artifactory
 artifactory_start_service: true
-
 artifactory_extra_java_opts: -server -Xms512m -Xmx4g -Xss256k -XX:+UseG1GC
 artifactory_system_yaml_template: system.yaml.j2
 artifactory_tar_file_name: jfrog-artifactory-pro-{{ artifactory_version }}-linux.tar.gz
 artifactory_home: "{{ jfrog_home_directory }}/artifactory"
-artifactory_tar: "https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/\
-  {{ artifactory_version }}/{{ artifactory_tar_file_name }}"
+artifactory_tar: "https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/{{ artifactory_tar_file_name }}"
 artifactory_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}"
-
 # Timeout in seconds for URL request
 artifactory_download_timeout: 10
-
 # Added optional variable to download from external url
 postgres_driver_download: true
 postgres_driver_version: 42.6.0
-postgres_driver_download_url: "https://repo1.maven.org/maven2/org/postgresql/postgresql/\
-  {{ postgres_driver_version }}/postgresql-{{ postgres_driver_version }}.jar"
-
+postgres_driver_download_url: "https://repo1.maven.org/maven2/org/postgresql/postgresql/{{ postgres_driver_version }}/postgresql-{{ postgres_driver_version }}.jar"
 artifactory_user: artifactory
 artifactory_group: artifactory
-
 artifactory_daemon: artifactory
-
 artifactory_uid: 1030
 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
-
 artifactory_service_file: /lib/systemd/system/artifactory.service
-
 # Provide systemyaml content below with 2-space indentation
 artifactory_systemyaml: |-
   configVersion: 1
@@ -97,7 +76,6 @@ artifactory_systemyaml: |-
   router:
     entrypoints:
       internalPort: 8046
-
 # Provide binarystore XML content below with 2-space indentation
 artifactory_binarystore: |-
   {%- if artifactory_ha_enabled -%}
@@ -111,17 +89,14 @@ artifactory_binarystore: |-
     <chain template="file-system"/>
   </config>
   {%- endif -%}
-
 # Note: artifactory_systemyaml_override is by default false,  if you want to change default artifactory_systemyaml
 artifactory_systemyaml_override: false
-
 # Allow artifactory user to create crontab rules
 artifactory_allow_crontab: false
-
 # Provide access config patch content 
-artifactory_access_config_patch: |-
+artifactory_access_config_patch: ""
 # security:
 #   authentication:
 #     mtls:
 #       enabled: true                  
-#       extraction-regex: (.*)
+#       extraction-regex: (.*)
diff --git 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,4 @@
 # platform collection version
-platform_collection_version: 10.20.1
-
+platform_collection_version: 10.20.2
 # 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
@@ -1,5 +1,4 @@
 # platform collection version
-platform_collection_version: 10.20.1
-
+platform_collection_version: 10.20.2
 # 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
@@ -1,5 +1,4 @@
 # platform collection version
-platform_collection_version: 10.20.1
-
+platform_collection_version: 10.20.2
 # 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
@@ -1,56 +1,40 @@
 # Defaults file for xray
 
 # The version of xray to install
-xray_version: 3.107.11
-
+xray_version: 3.107.16
 # Whether to enable HA
 xray_ha_enabled: false
-
 xray_ha_node_type: master
-
 # The location where xray should install
 jfrog_home_directory: /opt/jfrog
-
 # The remote xray download file
 xray_tar_file_name: jfrog-xray-{{ xray_version }}-linux.tar.gz
 xray_tar: https://releases.jfrog.io/artifactory/jfrog-xray/xray-linux/{{ xray_version }}/{{ xray_tar_file_name }}
-
 # Timeout in seconds for URL request
 xray_download_timeout: 10
-
 # The xray install directory
 xray_untar_home: "{{ jfrog_home_directory }}/jfrog-xray-{{ xray_version }}-linux"
 xray_home: "{{ jfrog_home_directory }}/xray"
-
 xray_install_script_path: "{{ xray_home }}/app/bin"
 xray_thirdparty_path: "{{ xray_home }}/app/third-party"
 xray_archive_service_cmd: "{{ xray_install_script_path }}/installService.sh"
 xray_service_file: /lib/systemd/system/xray.service
-
 # Xray users and groups
 xray_user: xray
 xray_group: xray
-
 xray_uid: 1035
 xray_gid: 1035
-
 xray_daemon: xray
-
 # Rabbitmq user
 xray_rabbitmq_user: guest
 xray_rabbitmq_password: guest
 xray_rabbitmq_url: "amqp://localhost:5672/"
 xray_rabbitmq_default_cookie: "XRAY_RABBITMQ_COOKIE"
-
 # if this is an upgrade
 xray_upgrade_only: false
-
 xray_system_yaml_template: system.yaml.j2
-
 linux_distro: "{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}"
-
 centos_gpg_key: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official"
-
 xray_db_util_search_filter:
   ubuntu18:
     db5: 'db5.3-util.*ubuntu1.1.*amd64\.deb'
@@ -71,17 +55,20 @@ xray_db_util_search_filter:
     db: 'libdb-utils-5.3.*el7.x86_64.rpm'
   redhat9:
     db: 'libdb-utils-5.3.*el9.x86_64.rpm'
+yum_python_interpreter: >-
+  {%- if linux_distro is not defined -%}
 
 
-yum_python_interpreter: >-
-    {%- if linux_distro is not defined -%}
-        /usr/bin/python3
-    {%- elif linux_distro in ['centos7', 'redhat7'] -%}
-        /usr/bin/python
-    {%- else -%}
-        /usr/bin/python3
-    {%- endif -%}
+      /usr/bin/python3
+  {%- elif linux_distro in ['centos7', 'redhat7'] -%}
 
+
+      /usr/bin/python
+  {%- else -%}
+
+
+      /usr/bin/python3
+  {%- endif -%}
 # Provide systemyaml content below with 2-space indentation
 xray_systemyaml: |-
   configVersion: 1
@@ -108,11 +95,8 @@ xray_systemyaml: |-
   router:
     entrypoints:
       internalPort: 8046
-
 # Note: xray_systemyaml_override is by default false,  if you want to change default xray_systemyaml
 xray_systemyaml_override: false
-
 xray_start_service: true
-
 # Allow xray user to create crontab rules
-xray_allow_crontab: false
+xray_allow_crontab: 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
@@ -1,5 +1,4 @@
 # platform collection version
-platform_collection_version: 10.20.1
-
+platform_collection_version: 10.20.2
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy