diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index 0847904a..22bedd0b 100644 --- a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md +++ b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md @@ -1,9 +1,11 @@ # JFrog Platform Ansible Collection Changelog All changes to this collection will be documented in this file. -## [10.15.4] - Oct 2, 2023 -* Configure admin password -* Formatting README.md +## [10.16.0] - Oct 26, 2023 +* Artifactory - Configure admin credentials [GH-335](https://github.com/jfrog/JFrog-Cloud-Installers/pull/335) +* Postgres - Assert that database username and password are defined [GH-336](https://github.com/jfrog/JFrog-Cloud-Installers/pull/336) +* Xray - Added a condition to check if socat already exists in rabbitmq +* Product Updates/fixes ## [10.15.3] - Oct 16, 2023 * Product Updates/fixes diff --git a/Ansible/ansible_collections/jfrog/platform/README.md b/Ansible/ansible_collections/jfrog/platform/README.md index 9ea560e8..d39c196f 100644 --- a/Ansible/ansible_collections/jfrog/platform/README.md +++ b/Ansible/ansible_collections/jfrog/platform/README.md @@ -149,4 +149,4 @@ The JFrog Platform Ansible Collection can be installed on the following operatin * By default, ansible_python_interpreter: "/usr/bin/python3" used , For Centos/RHEL-7, Set this to "/usr/bin/python" . For example ```bash ansible-playbook -vv platform.yml -i hosts.ini -e 'ansible_python_interpreter=/usr/bin/python' -``` +``` \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index 207c1c85..891ed0a2 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.15.3" +version: "10.16.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 0d33fcad..5995fa98 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.68.14 +artifactory_version: 7.71.3 # 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 @@ -67,6 +67,7 @@ artifactory_upgrade_only: 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 diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml index 20566972..4c69791d 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml @@ -110,7 +110,7 @@ group: "{{ artifactory_group }}" loop: - "{{ artifactory_home }}/var/data" - - "{{ artifactory_home }}/var/etc/" + - "{{ artifactory_home }}/var/etc" - "{{ artifactory_home }}/var/etc/security/" - "{{ artifactory_home }}/var/etc/artifactory/info/" @@ -234,4 +234,4 @@ delay: 5 when: - not ansible_check_mode - - artifactory_start_service | bool + - artifactory_start_service | bool \ No newline at end of file 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 b6848952..08a0ab00 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.15.3 +platform_collection_version: 10.16.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 fb7da840..bd101132 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.15.3 +platform_collection_version: 10.16.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 fb7da840..bd101132 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.15.3 +platform_collection_version: 10.16.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 15309e4a..dec0439d 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.83.9 +xray_version: 3.83.10 # Whether to enable HA xray_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml index 4c7b1143..ce1f4224 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml @@ -20,6 +20,15 @@ - ansible_distribution_release == 'xenial' - check_libssl_package_result.matched > 0 +- name: Gather the package facts + ansible.builtin.package_facts: + manager: auto + +- name: Check whether a package called socat is installed + ansible.builtin.debug: + msg: "{{ ansible_facts.packages['socat'] | length }} versions of socat are installed!" + when: "'socat' in ansible_facts.packages" + - name: Find socat package ansible.builtin.find: paths: "{{ xray_home }}/app/third-party/rabbitmq/" @@ -27,11 +36,14 @@ use_regex: true file_type: file register: check_socat_package_result + when: "'socat' not in ansible_facts.packages" - name: Set socat package file name ansible.builtin.set_fact: xray_socat_package: "{{ check_socat_package_result.files[0].path }}" - when: check_socat_package_result.matched > 0 + when: + - "'socat' not in ansible_facts.packages" + - check_socat_package_result.matched > 0 - name: Install socat package become: true @@ -39,7 +51,9 @@ ansible.builtin.apt: deb: "{{ xray_socat_package }}" register: install_socat_package_result - when: check_socat_package_result.matched > 0 + when: + - "'socat' not in ansible_facts.packages" + - check_socat_package_result.matched > 0 - name: Find erlang package ansible.builtin.find: 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 fb7da840..bd101132 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.15.3 +platform_collection_version: 10.16.0 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy