Added support for Artifactory and Xray upgrades. v1.0.8

Ansible/ansible_collections/jfrog/installers/roles/xray/README.md

@@ -12,6 +12,7 @@ The xray role will install Xray software onto the host. An Artifactory server an
 * _db_user_: The database user to configure. eg. "xray"
 * _db_password_: The database password to configure. "xray"
 * _system_file_: Your own [system YAML](https://www.jfrog.com/confluence/display/JFROG/System+YAML+Configuration+File) file can be specified and used. If specified, this file will be used rather than constructing a file from the parameters above.
+* _xray_upgrade_only_: Perform an software upgrade only. Default is false.
 
 ## Example Playbook
 ```
@@ -19,4 +20,16 @@ The xray role will install Xray software onto the host. An Artifactory server an
 - hosts: xray
   roles:
     - xray
+```
+
+## Upgrades
+The Xray role supports software upgrades. To use a role to perform a software upgrade only, use the _xray_upgrade_only_ variables and specify the version. See the following example.
+
+```
+- hosts: xray
+  vars:
+    xray_version: "{{ lookup('env', 'xray_version_upgrade') }}"
+    xray_upgrade_only: true
+  roles:
+    - xray
 ```

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

@@ -10,14 +10,18 @@ xray_version: 3.5.2
 xray_ha_enabled: true
 
 # The location where xray should install.
-xray_download_directory: /opt/jfrog
+jfrog_home_directory: /opt/jfrog
 
 # The remote xray download file
-xray_tar: https://bintray.com/standAloneDownload/downloadArtifact?agree=true&artifactPath=/jfrog/jfrog-xray/xray-linux/{{ xray_version }}/jfrog-xray-{{ xray_version }}-linux.tar.gz&callback_id=anonymous&product=xray
+xray_tar: https://dl.bintray.com/jfrog/jfrog-xray/xray-linux/{{ xray_version }}/jfrog-xray-{{ xray_version }}-linux.tar.gz
 
 #The xray install directory
-xray_home: "{{ xray_download_directory }}/jfrog-xray-{{ xray_version }}-linux"
+xray_untar_home: "{{ jfrog_home_directory }}/jfrog-xray-{{ xray_version }}-linux"
+xray_home: "{{ jfrog_home_directory }}/xray"
 
 #xray users and groups
 xray_user: xray
 xray_group: xray
+
+# if this is an upgrade
+xray_upgrade_only: false

Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/install.yml

@@ -0,0 +1,103 @@
+---
+- debug:
+    msg: "Performing installation of Xray..."
+
+- name: create group for xray
+  group:
+    name: "{{ xray_group }}"
+    state: present
+  become: yes
+
+- name: create user for xray
+  user:
+    name: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+    system: yes
+  become: yes
+
+- name: ensure jfrog_home_directory exists
+  file:
+    path: "{{ jfrog_home_directory }}"
+    state: directory
+  become: yes
+
+- name: download xray
+  unarchive:
+    src: "{{ xray_tar }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: yes
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+    creates: "{{ xray_untar_home }}"
+  become: yes
+  register: downloadxray
+  until: downloadxray is succeeded
+  retries: 3
+
+- name: MV untar directory to xray home
+  command: "mv {{ xray_untar_home }} {{ xray_home }}"
+  become: yes
+
+- debug:
+    msg: "Running dependency installation for {{ ansible_os_family }}"
+
+- name: perform dependency installation
+  include_tasks: "{{ ansible_os_family }}.yml"
+
+- name: ensure etc exists
+  file:
+    path: "{{ xray_home }}/var/etc"
+    state: directory
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+  become: yes
+
+- name: configure system yaml
+  template:
+    src: system.yaml.j2
+    dest: "{{ xray_home }}/var/etc/system.yaml"
+  become: yes
+
+- name: ensure {{ xray_home }}/var/etc/security/ exists
+  file:
+    path: "{{ xray_home }}/var/etc/security/"
+    state: directory
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+  become: yes
+
+- name: configure master key
+  template:
+    src: master.key.j2
+    dest: "{{ xray_home }}/var/etc/security/master.key"
+  become: yes
+
+- name: configure join key
+  template:
+    src: join.key.j2
+    dest: "{{ xray_home }}/var/etc/security/join.key"
+  become: yes
+
+- name: ensure {{ xray_home }}/var/etc/info/ exists
+  file:
+    path: "{{ xray_home }}/var/etc/info/"
+    state: directory
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+  become: yes
+
+- name: configure installer info
+  template:
+    src: installer-info.json.j2
+    dest: "{{ xray_home }}/var/etc/info/installer-info.json"
+  become: yes
+
+- name: create xray service
+  shell: "{{ xray_home }}/app/bin/installService.sh"
+  become: yes
+
+- name: start and enable xray
+  service:
+    name: xray
+    state: restarted
+  become: yes

Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/main.yml

@@ -1,96 +1,6 @@
----
-- name: create group for xray
-  group:
-    name: "{{ xray_group }}"
-    state: present
-  become: yes
-
-- name: create user for xray
-  user:
-    name: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-    system: yes
-  become: yes
-
-- name: ensure xray_download_directory exists
-  file:
-    path: "{{ xray_download_directory }}"
-    state: directory
-  become: yes
-
-- name: download xray
-  unarchive:
-    src: "{{ xray_tar }}"
-    dest: "{{ xray_download_directory }}"
-    remote_src: yes
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-    creates: "{{ xray_home }}"
-  become: yes
-  register: downloadxray
-  until: downloadxray is succeeded
-  retries: 3
-
-- debug:
-    msg: "Running dependency installation for {{ ansible_os_family }}"
-
-- name: perform dependency installation
-  include_tasks: "{{ ansible_os_family }}.yml"
-
-- name: ensure etc exists
-  file:
-    path: "{{ xray_home }}/var/etc"
-    state: directory
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-  become: yes
-
-- name: configure system yaml
-  template:
-    src: system.yaml.j2
-    dest: "{{ xray_home }}/var/etc/system.yaml"
-  become: yes
-
-- name: ensure {{ xray_home }}/var/etc/security/ exists
-  file:
-    path: "{{ xray_home }}/var/etc/security/"
-    state: directory
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-  become: yes
-
-- name: configure master key
-  template:
-    src: master.key.j2
-    dest: "{{ xray_home }}/var/etc/security/master.key"
-  become: yes
-
-- name: configure join key
-  template:
-    src: join.key.j2
-    dest: "{{ xray_home }}/var/etc/security/join.key"
-  become: yes
-
-- name: ensure {{ xray_home }}/var/etc/info/ exists
-  file:
-    path: "{{ xray_home }}/var/etc/info/"
-    state: directory
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-  become: yes
-
-- name: configure installer info
-  template:
-    src: installer-info.json.j2
-    dest: "{{ xray_home }}/var/etc/info/installer-info.json"
-  become: yes
-
-- name: create xray service
-  shell: "{{ xray_home }}/app/bin/installService.sh"
-  become: yes
-
-- name: start and enable xray
-  service:
-    name: xray
-    state: restarted
-  become: yes
+- name: perform installation
+  include_tasks: "install.yml"
+  when: not xray_upgrade_only
+- name: perform upgrade
+  include_tasks: "upgrade.yml"
+  when: xray_upgrade_only

Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/upgrade.yml

@@ -0,0 +1,54 @@
+---
+- debug:
+    msg: "Performing upgrade of Xray..."
+
+- name: stop xray
+  service:
+    name: xray
+    state: stopped
+  become: yes
+
+- name: ensure jfrog_home_directory exists
+  file:
+    path: "{{ jfrog_home_directory }}"
+    state: directory
+  become: yes
+
+- name: download xray
+  unarchive:
+    src: "{{ xray_tar }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: yes
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+    creates: "{{ xray_untar_home }}"
+  become: yes
+  register: downloadxray
+  until: downloadxray is succeeded
+  retries: 3
+
+- name: Delete xray app
+  file:
+    path: "{{ xray_home }}/app"
+    state: absent
+  become: yes
+
+- name: CP new app to xray app
+  command: "cp -r {{ xray_untar_home }}/app {{ xray_home }}/app"
+  become: yes
+
+- name: Delete untar directory
+  file:
+    path: "{{ xray_untar_home }}"
+    state: absent
+  become: yes
+
+- name: create xray service
+  shell: "{{ xray_home }}/app/bin/installService.sh"
+  become: yes
+
+- name: start and enable xray
+  service:
+    name: xray
+    state: restarted
+  become: yes