Skip to content

Commit 5716288

Browse files
committed
[ansible] JFrog Platform 11.0.4 release
1 parent d5d1981 commit 5716288

File tree

7 files changed

+26
-86
lines changed

7 files changed

+26
-86
lines changed

Ansible/ansible_collections/jfrog/platform/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# JFrog Platform Ansible Collection Changelog
22
All changes to this collection will be documented in this file.
33

4+
## [11.0.4] - March 12, 2025
5+
* Removed obsolete variable `artifactory_flavour` [GH-409](https://github.com/jfrog/JFrog-Cloud-Installers/issues/409)
6+
* Product Updates/fixes
7+
48
## [11.0.3] - Feb 26, 2025
59
* Product Updates/fixes
610

Ansible/ansible_collections/jfrog/platform/galaxy.yml

+3-18
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,27 @@
44
# content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
55
# underscores or numbers and cannot contain consecutive underscores
66
namespace: "jfrog"
7-
87
# The name of the collection. Has the same character restrictions as 'namespace'
98
name: "platform"
10-
119
# The version of the collection. Must be compatible with semantic versioning
12-
version: "11.0.3"
13-
10+
version: 11.0.4
1411
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
1512
readme: "README.md"
16-
1713
# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
1814
# @nicks:irc/im.site#channel'
1915
authors:
2016
- "JFrog Maintainers Team <[email protected]>"
21-
22-
2317
### OPTIONAL but strongly recommended
2418

2519
# A short summary description of the collection
26-
description: "This collection provides roles for installing JFrog Platform which includes Artifactory, Distribution and Xray.\
27-
Additionally, it provides optional SSL and Postgresql roles if these are needed for your deployment."
28-
20+
description: "This collection provides roles for installing JFrog Platform which includes Artifactory, Distribution and Xray.Additionally, it provides optional SSL and Postgresql roles if these are needed for your deployment."
2921
# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
3022
# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
3123
license:
3224
- "Apache-2.0"
33-
3425
# The path to the license file for the collection. This path is relative to the root of the collection. This key is
3526
# mutually exclusive with 'license'
3627
license_file: ""
37-
3828
# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
3929
# requirements as 'namespace' and 'name'
4030
tags:
@@ -45,21 +35,16 @@ tags:
4535
- artifactory
4636
- distribution
4737
- xray
48-
4938
# Collections that this collection requires to be installed for it to be usable. The key of the dict is the
5039
# collection label 'namespace.name'. The value is a version range
5140
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
5241
# range specifiers can be set and are separated by ','
5342
dependencies: {}
54-
5543
# The URL of the originating SCM repository
5644
repository: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible"
57-
5845
# The URL to any online docs
5946
documentation: "https://github.com/jfrog/JFrog-Cloud-Installers/blob/master/Ansible/ansible_collections/jfrog/platform/README.md"
60-
6147
# The URL to the homepage of the collection/project
6248
homepage: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible/ansible_collections/jfrog/platform"
63-
6449
# The URL to the collection issue tracker
65-
issues: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
50+
issues: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
# Defaults file for artifactory
22

33
# The version of artifactory to install
4-
artifactory_version: 7.104.10
5-
4+
artifactory_version: 7.104.12
65
# Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role )
76
artifactory_nginx_ssl_enabled: false
8-
97
# Set this to false when ngnix is disabled, defaults to true (implies artifactory uses artifactory_nginx role )
108
artifactory_nginx_enabled: true
11-
129
# Provide single or HA individual licenses file separated by new line and 2-space indentation and for HA, set artifactory_ha_enabled: true.
1310
# Example: Replace <license_1> , <license_2> , <license_3> with original licenses
1411
# artifactory_licenses: |-
@@ -20,62 +17,42 @@ artifactory_nginx_enabled: true
2017

2118
# To enable HA, set to true
2219
artifactory_ha_enabled: false
23-
2420
# By default, all nodes are primary (CNHA) - https://www.jfrog.com/confluence/display/JFROG/High+Availability#HighAvailability-Cloud-NativeHighAvailability
2521
artifactory_taskaffinity: any
26-
2722
# To enable mission-control in artifactory (>= 7.27.x) applicable only on E+ license
2823
artifactory_mc_enabled: true
29-
3024
# The location where Artifactory should install
3125
jfrog_home_directory: /opt/jfrog
32-
33-
# Pick the Artifactory flavour to install, can be also cpp-ce/jcr/pro
34-
artifactory_flavour: pro
35-
3626
# Whether to start Artifactory
3727
artifactory_start_service: true
38-
3928
artifactory_extra_java_opts: -server -Xms512m -Xmx4g -Xss256k -XX:+UseG1GC
4029
artifactory_system_yaml_template: system.yaml.j2
4130
artifactory_tar_file_name: jfrog-artifactory-pro-{{ artifactory_version }}-linux.tar.gz
4231
artifactory_home: "{{ jfrog_home_directory }}/artifactory"
43-
artifactory_tar: "https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/\
44-
{{ artifactory_version }}/{{ artifactory_tar_file_name }}"
45-
artifactory_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}"
46-
32+
artifactory_tar: "https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/{{ artifactory_tar_file_name }}"
33+
artifactory_untar_home: "{{ jfrog_home_directory }}/artifactory-pro-{{ artifactory_version }}"
4734
# Timeout in seconds for URL request
4835
artifactory_download_timeout: 10
49-
5036
# Added optional variable to download from external url
5137
postgres_driver_download: true
5238
postgres_driver_version: 42.6.0
53-
postgres_driver_download_url: "https://repo1.maven.org/maven2/org/postgresql/postgresql/\
54-
{{ postgres_driver_version }}/postgresql-{{ postgres_driver_version }}.jar"
55-
39+
postgres_driver_download_url: "https://repo1.maven.org/maven2/org/postgresql/postgresql/{{ postgres_driver_version }}/postgresql-{{ postgres_driver_version }}.jar"
5640
artifactory_user: artifactory
5741
artifactory_group: artifactory
58-
5942
artifactory_daemon: artifactory
60-
6143
artifactory_uid: 1030
6244
artifactory_gid: 1030
63-
6445
# If this is an upgrade
6546
artifactory_upgrade_only: false
66-
6747
# To run Artifactory with any database other than PostgreSQL, allowNonPostgresql set to true
6848
artifactory_allowNonPostgresql: false
69-
7049
# Default username and password, uncomment and change to manage with ansible
7150
# artifactory_admin_username: admin
7251
# artifactory_admin_password: password
7352

7453
# Set this to true to generate a bootstrap admin token
7554
artifactory_generate_bootstrap_token: false
76-
7755
artifactory_service_file: /lib/systemd/system/artifactory.service
78-
7956
# Provide systemyaml content below with 2-space indentation
8057
artifactory_systemyaml: |-
8158
configVersion: 1
@@ -100,7 +77,6 @@ artifactory_systemyaml: |-
10077
router:
10178
entrypoints:
10279
internalPort: 8046
103-
10480
# Provide binarystore XML content below with 2-space indentation
10581
artifactory_binarystore: |-
10682
{%- if artifactory_ha_enabled -%}
@@ -114,16 +90,13 @@ artifactory_binarystore: |-
11490
<chain template="file-system"/>
11591
</config>
11692
{%- endif -%}
117-
11893
# Note: artifactory_systemyaml_override is by default false, if you want to change default artifactory_systemyaml
11994
artifactory_systemyaml_override: false
120-
12195
# Allow artifactory user to create crontab rules
12296
artifactory_allow_crontab: false
123-
124-
artifactory_access_config_patch: |-
97+
artifactory_access_config_patch: ""
12598
# security:
12699
# authentication:
127100
# mtls:
128101
# enabled: true
129-
# extraction-regex: (.*)
102+
# extraction-regex: (.*)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# platform collection version
2-
platform_collection_version: 11.0.3
3-
2+
platform_collection_version: 11.0.4
43
# indicates where this collection was downloaded from (galaxy, automation_hub, standalone)
54
ansible_marketplace: galaxy
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# platform collection version
2-
platform_collection_version: 11.0.3
3-
2+
platform_collection_version: 11.0.4
43
# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
54
ansible_marketplace: galaxy

Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml

+10-29
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,40 @@
11
# Defaults file for xray
22

33
# The version of xray to install
4-
xray_version: 3.111.15
5-
4+
xray_version: 3.111.20
65
# Whether to enable HA
76
xray_ha_enabled: false
8-
97
xray_ha_node_type: master
10-
118
# The location where xray should install
129
jfrog_home_directory: /opt/jfrog
13-
1410
# The remote xray download file
1511
xray_tar_file_name: jfrog-xray-{{ xray_version }}-linux.tar.gz
1612
xray_tar: https://releases.jfrog.io/artifactory/jfrog-xray/xray-linux/{{ xray_version }}/{{ xray_tar_file_name }}
17-
1813
# Timeout in seconds for URL request
1914
xray_download_timeout: 10
20-
2115
# The xray install directory
2216
xray_untar_home: "{{ jfrog_home_directory }}/jfrog-xray-{{ xray_version }}-linux"
2317
xray_home: "{{ jfrog_home_directory }}/xray"
24-
2518
xray_install_script_path: "{{ xray_home }}/app/bin"
2619
xray_thirdparty_path: "{{ xray_home }}/app/third-party"
2720
xray_archive_service_cmd: "{{ xray_install_script_path }}/installService.sh"
2821
xray_service_file: /lib/systemd/system/xray.service
29-
3022
# Xray users and groups
3123
xray_user: xray
3224
xray_group: xray
33-
3425
xray_uid: 1035
3526
xray_gid: 1035
36-
3727
xray_daemon: xray
38-
3928
# Rabbitmq user
4029
xray_rabbitmq_user: guest
4130
xray_rabbitmq_password: guest
4231
xray_rabbitmq_url: "amqp://localhost:5672/"
4332
xray_rabbitmq_default_cookie: "XRAY_RABBITMQ_COOKIE"
44-
4533
# if this is an upgrade
4634
xray_upgrade_only: false
47-
4835
xray_system_yaml_template: system.yaml.j2
49-
5036
linux_distro: "{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}"
51-
5237
centos_gpg_key: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official"
53-
5438
xray_db_util_search_filter:
5539
ubuntu18:
5640
db5: 'db5.3-util.*ubuntu1.1.*amd64\.deb'
@@ -71,17 +55,17 @@ xray_db_util_search_filter:
7155
db: 'libdb-utils-5.3.*el7.x86_64.rpm'
7256
redhat9:
7357
db: 'libdb-utils-5.3.*el9.x86_64.rpm'
58+
yum_python_interpreter: >-
59+
{%- if linux_distro is not defined -%}
7460
61+
/usr/bin/python3
62+
{%- elif linux_distro in ['centos7', 'redhat7'] -%}
7563
76-
yum_python_interpreter: >-
77-
{%- if linux_distro is not defined -%}
78-
/usr/bin/python3
79-
{%- elif linux_distro in ['centos7', 'redhat7'] -%}
80-
/usr/bin/python
81-
{%- else -%}
82-
/usr/bin/python3
83-
{%- endif -%}
64+
/usr/bin/python
65+
{%- else -%}
8466
67+
/usr/bin/python3
68+
{%- endif -%}
8569
# Provide systemyaml content below with 2-space indentation
8670
xray_systemyaml: |-
8771
configVersion: 1
@@ -108,11 +92,8 @@ xray_systemyaml: |-
10892
router:
10993
entrypoints:
11094
internalPort: 8046
111-
11295
# Note: xray_systemyaml_override is by default false, if you want to change default xray_systemyaml
11396
xray_systemyaml_override: false
114-
11597
xray_start_service: true
116-
11798
# Allow xray user to create crontab rules
118-
xray_allow_crontab: false
99+
xray_allow_crontab: false
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# platform collection version
2-
platform_collection_version: 11.0.3
3-
2+
platform_collection_version: 11.0.4
43
# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
54
ansible_marketplace: galaxy

0 commit comments

Comments
 (0)