diff --git a/Ansible/CHANGELOG.md b/Ansible/CHANGELOG.md index 25ace90..9c8cfdb 100644 --- a/Ansible/CHANGELOG.md +++ b/Ansible/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [1.1.1] - 2020-10-15 +- added idempotence to artifactory installer +- added fix for derby deployments +- Migration to reduce changes during playbook runs contains breaking changes. You either must run once before upgrade, or provide playbook with valid credentials to access version information for it to perform properly. +- First time installers need not worry about above + ## [1.1.0] - 2020-09-27 - Validated for Artifactory 7.7.8 and Xray 3.8.6. diff --git a/Ansible/README.md b/Ansible/README.md index f22db8d..4bb6314 100644 --- a/Ansible/README.md +++ b/Ansible/README.md @@ -12,6 +12,7 @@ This Ansible directory consists of the following directories that support the JF | collection_version | artifactory_version | xray_version | |--------------------|---------------------|--------------| +| 1.1.1 | 7.10.2 | 3.9.1 | | 1.1.0 | 7.7.8 | 3.8.6 | | 1.0.9 | 7.7.3 | 3.8.0 | | 1.0.8 | 7.7.3 | 3.8.0 | diff --git a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz index a4073ac..02495d5 100644 Binary files a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz and b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.1.1.tar.gz differ diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml index e718add..65728de 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/tasks/main.yml @@ -1,9 +1,10 @@ - name: Rectify Legacy Installation Block block: - - name: Check to see if artifactory has a service - systemd: - state: stopped + - name: Check to see if artifactory has a service and stop it + service: name: artifactory + state: stopped + become: yes - name: Check symlink method stat: path: /opt/jfrog/artifactory/app @@ -24,10 +25,10 @@ include_tasks: "legacy_migration.yml" when: (not newMethod.stat.islnk) and newMethod.stat.exists rescue: - - name: Check to see if artifactory has a service - systemd: - state: stopped + - name: Check to see if artifactory has a service and stop it + service: name: artifactory + state: stopped - name: Setup temporary untar home (assuming version is set var for version) set_fact: temp_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}"