From 519737ac067d58b7a2c0d9a116837d1862d26c75 Mon Sep 17 00:00:00 2001 From: Ram Mohan Rao Chukka <1331672+chukka@users.noreply.github.com> Date: Tue, 8 Feb 2022 15:25:01 +0530 Subject: [PATCH] [ansible] JFrog Platform 10.3.0 release (#200) --- .../jfrog/platform/CHANGELOG.md | 5 +++++ .../jfrog/platform/galaxy.yml | 2 +- .../roles/artifactory/defaults/main.yml | 2 +- .../shared/ensure_permissions_correct.yml | 12 +++++++++++ .../roles/artifactory/tasks/install.yml | 7 +------ .../roles/artifactory/tasks/upgrade.yml | 20 ++----------------- .../platform/roles/artifactory/vars/main.yml | 2 +- .../roles/distribution/defaults/main.yml | 2 +- .../platform/roles/distribution/vars/main.yml | 2 +- .../platform/roles/insight/defaults/main.yml | 2 +- .../platform/roles/insight/vars/main.yml | 2 +- .../jfrog/platform/roles/xray/vars/main.yml | 2 +- 12 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/ensure_permissions_correct.yml diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index f695806..2e6991e 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.3.0] - Feb 8, 2022 +* Performance improvement for permission check [GH-192](https://github.com/jfrog/JFrog-Cloud-Installers/pull/192) +* Fixed - Artifactory upgrade mode breaks existing installation [GH-194](https://github.com/jfrog/JFrog-Cloud-Installers/issues/194) +* Product Updates/fixes + ## [10.2.0] - Jan 31, 2022 * Product Updates/fixes diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index 2579c73..f8da037 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.2.0" +version: "10.3.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 227a168..2d1f62f 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.31.13 +artifactory_version: 7.33.9 # 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 diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/ensure_permissions_correct.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/ensure_permissions_correct.yml new file mode 100644 index 0000000..38374c5 --- /dev/null +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/ensure_permissions_correct.yml @@ -0,0 +1,12 @@ +- name: Ensure permissions are correct + become: yes + block: + - name: Ensure user ownership + ansible.builtin.command: find {{ jfrog_home_directory }} ! -user {{ artifactory_user }} -print -exec chown {{ artifactory_user }} {} \; + register: user_ownerships + changed_when: user_ownerships.stdout_lines | length > 0 + + - name: Ensure group ownership + ansible.builtin.command: find {{ jfrog_home_directory }} ! -group {{ artifactory_group }} -print -exec chgrp {{ artifactory_group }} {} \; + register: group_ownerships + changed_when: user_ownerships.stdout_lines | length > 0 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 694458d..9ff7f33 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml @@ -190,12 +190,7 @@ creates: "{{ artifactory_service_file }}" - name: Ensure permissions are correct - become: yes - file: - path: "{{ jfrog_home_directory }}" - group: "{{ artifactory_group }}" - owner: "{{ artifactory_user }}" - recurse: yes + include_tasks: shared/ensure_permissions_correct.yml - name: Restart artifactory meta: flush_handlers diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml index 45a7d69..3a93359 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml @@ -48,18 +48,7 @@ command: "cp -r {{ artifactory_untar_home }}/app/. {{ artifactory_home }}/app" when: download_artifactory.changed -- name: Configure single license - become: yes - template: - src: artifactory.lic.j2 - dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.lic" - mode: 0644 - when: - - artifactory_single_license is defined - - artifactory_single_license | length > 0 - notify: restart artifactory - -- name: Configure HA licenses +- name: Configure artifactory license(s) become: yes template: src: artifactory.cluster.license.j2 @@ -126,12 +115,7 @@ notify: restart artifactory - name: Ensure permissions are correct - become: yes - file: - path: "{{ jfrog_home_directory }}" - group: "{{ artifactory_group }}" - owner: "{{ artifactory_user }}" - recurse: yes + include_tasks: shared/ensure_permissions_correct.yml - name: Restart artifactory meta: flush_handlers 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 5589c44..49a9113 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.2.0 +platform_collection_version: 10.3.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/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml index 3f2d2c0..6abc9a1 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for distribution # The version of distribution to install -distribution_version: 2.10.5 +distribution_version: 2.11.0 # whether to enable HA distribution_ha_enabled: false 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 2e6b186..13c3be2 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.2.0 +platform_collection_version: 10.3.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/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml index d907540..9ad3698 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for insight # The version of insight to install -insight_version: 1.5.0 +insight_version: 1.6.0 # whether to enable HA insight_ha_enabled: false 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 2e6b186..13c3be2 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.2.0 +platform_collection_version: 10.3.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/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml index 2e6b186..13c3be2 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.2.0 +platform_collection_version: 10.3.0 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy