mirror of
https://github.com/ZwareBear/JFrog-Cloud-Installers.git
synced 2026-01-22 04:06:59 -06:00
[jfrog-platform] 7.25.7 release (#159)
This commit is contained in:
Ram Mohan Rao Chukka
committed by
GitHub
GitHub
parent
6997cd9efb
commit
b38d10db61
@@ -1,7 +1,7 @@
|
||||
# defaults file for xray
|
||||
|
||||
# The version of xray to install
|
||||
xray_version: 3.30.1
|
||||
xray_version: 3.32.2
|
||||
|
||||
# whether to enable HA
|
||||
xray_ha_enabled: false
|
||||
|
||||
@@ -5,3 +5,9 @@
|
||||
systemd:
|
||||
name: "{{ xray_daemon }}"
|
||||
state: restarted
|
||||
|
||||
- name: stop xray
|
||||
become: yes
|
||||
systemd:
|
||||
name: "{{ xray_daemon }}"
|
||||
state: stopped
|
||||
|
||||
@@ -1,16 +1,27 @@
|
||||
---
|
||||
dependencies: []
|
||||
|
||||
galaxy_info:
|
||||
author: "JFrog Maintainers Team <installers@jfrog.com>"
|
||||
description: "The xray role will install Xray software onto the host. An Artifactory server and Postgress database is required."
|
||||
company: JFrog
|
||||
|
||||
issue_tracker_url: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
|
||||
|
||||
license: license (Apache-2.0)
|
||||
|
||||
min_ansible_version: 2.9
|
||||
|
||||
platforms:
|
||||
- name: EL
|
||||
versions:
|
||||
- 7
|
||||
- 8
|
||||
- name: Ubuntu
|
||||
versions:
|
||||
- xenial
|
||||
- bionic
|
||||
- focal
|
||||
- name: Debian
|
||||
versions:
|
||||
- stretch
|
||||
- buster
|
||||
galaxy_tags:
|
||||
- xray
|
||||
- jfrog
|
||||
|
||||
dependencies: []
|
||||
- insight
|
||||
- jfrog
|
||||
@@ -42,3 +42,4 @@
|
||||
executable: /usr/bin/expect
|
||||
chdir: "{{ exp_dir }}"
|
||||
register: exp_result
|
||||
changed_when: false
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
- debug:
|
||||
msg: "Performing installation of Xray version : {{ xray_version }}"
|
||||
|
||||
- name: Install prerequisite packages
|
||||
include_tasks: "{{ ansible_os_family }}.yml"
|
||||
|
||||
@@ -56,7 +53,10 @@
|
||||
|
||||
- name: Copy untar directory to xray home
|
||||
become: yes
|
||||
command: "cp -r {{ xray_untar_home }}/. {{ xray_home }}"
|
||||
copy:
|
||||
src: "{{ xray_untar_home }}/"
|
||||
dest: "{{ xray_home }}"
|
||||
remote_src: yes
|
||||
when: not app_dir_check.stat.exists
|
||||
|
||||
- name: Create required directories
|
||||
@@ -115,6 +115,7 @@
|
||||
template:
|
||||
src: "rabbitmq.conf.j2"
|
||||
dest: "{{ xray_home }}/app/bin/rabbitmq/rabbitmq.conf"
|
||||
mode: 0644
|
||||
notify: restart xray
|
||||
|
||||
- name: Configure installer info
|
||||
@@ -122,22 +123,24 @@
|
||||
template:
|
||||
src: installer-info.json.j2
|
||||
dest: "{{ xray_home }}/var/etc/info/installer-info.json"
|
||||
mode: 0644
|
||||
notify: restart xray
|
||||
|
||||
- name: Check if systemyaml exists
|
||||
- name: Check if system.yaml exists
|
||||
become: yes
|
||||
stat:
|
||||
path: "{{ xray_home }}/var/etc/system.yaml"
|
||||
register: systemyaml
|
||||
|
||||
- name: Configure systemyaml
|
||||
- name: Configure system.yaml
|
||||
become: yes
|
||||
template:
|
||||
src: "{{ xray_system_yaml_template }}"
|
||||
dest: "{{ xray_home }}/var/etc/system.yaml"
|
||||
mode: 0644
|
||||
when:
|
||||
- xray_systemyaml is defined
|
||||
- xray_systemyaml|length > 0
|
||||
- xray_systemyaml | length > 0
|
||||
- xray_systemyaml_override or (not systemyaml.stat.exists)
|
||||
notify: restart xray
|
||||
|
||||
@@ -152,7 +155,7 @@
|
||||
|
||||
- name: Install xray as a service
|
||||
become: yes
|
||||
shell: "{{ xray_archive_service_cmd }}"
|
||||
command: "{{ xray_archive_service_cmd }}"
|
||||
args:
|
||||
chdir: "{{ xray_install_script_path }}"
|
||||
creates: "{{ xray_service_file }}"
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
- name: Check rabbitmq cluster_keepalive_interval option
|
||||
become: yes
|
||||
ignore_errors: yes
|
||||
shell: |
|
||||
./rabbitmqctl --erlang-cookie {{ xray_rabbitmq_default_cookie }} eval \
|
||||
'application:get_env(rabbit, cluster_keepalive_interval).' \
|
||||
| tr -d '}{' | cut -d ',' -f2
|
||||
args:
|
||||
chdir: "{{ xray_home }}/app/third-party/rabbitmq/sbin/"
|
||||
environment:
|
||||
LC_ALL: en_US.UTF-8
|
||||
LC_CTYPE: en_US.UTF-8
|
||||
register: cluster_keepalive_interval_value
|
||||
|
||||
- name: Check rabbitmq handshake_timeout option
|
||||
become: yes
|
||||
ignore_errors: yes
|
||||
shell: |
|
||||
./rabbitmqctl --erlang-cookie {{ xray_rabbitmq_default_cookie }} eval \
|
||||
'application:get_env(rabbit, handshake_timeout).' \
|
||||
| tr -d '}{' | cut -d ',' -f2
|
||||
args:
|
||||
chdir: "{{ xray_home }}/app/third-party/rabbitmq/sbin/"
|
||||
environment:
|
||||
LC_ALL: en_US.UTF-8
|
||||
LC_CTYPE: en_US.UTF-8
|
||||
register: handshake_timeout_value
|
||||
|
||||
- name: Check rabbitmq vm_memory_high_watermark.relative option
|
||||
become: yes
|
||||
ignore_errors: yes
|
||||
shell: |
|
||||
./rabbitmqctl --erlang-cookie {{ xray_rabbitmq_default_cookie }} eval \
|
||||
'application:get_env(rabbit, vm_memory_high_watermark).' \
|
||||
| tr -d '}{' | cut -d ',' -f2
|
||||
args:
|
||||
chdir: "{{ xray_home }}/app/third-party/rabbitmq/sbin/"
|
||||
environment:
|
||||
LC_ALL: en_US.UTF-8
|
||||
LC_CTYPE: en_US.UTF-8
|
||||
register: vm_memory_high_watermark_relative_value
|
||||
|
||||
- name: Store result
|
||||
include_role:
|
||||
name: report
|
||||
vars:
|
||||
stop_testing_if_fail: false
|
||||
test_description: "{{ test_ext_description }}Check rabbitmq custom options values. INST-775"
|
||||
test_host: "{{ inventory_hostname }}"
|
||||
test_result: >-
|
||||
{{
|
||||
vm_memory_high_watermark_relative_value.stdout == rabbitmq_custom_values['vm_memory_high_watermark']
|
||||
and cluster_keepalive_interval_value.stdout == rabbitmq_custom_values['cluster_keepalive_interval']
|
||||
and handshake_timeout_value.stdout == rabbitmq_custom_values['handshake_timeout']
|
||||
}}
|
||||
report_action: "store-result"
|
||||
log_result: >-
|
||||
{{
|
||||
{}
|
||||
| combine({'handshake_timeout': {'real': handshake_timeout_value.stdout, 'expected': rabbitmq_custom_values.handshake_timeout}})
|
||||
| combine({'vm_memory_high_watermark': {'real': vm_memory_high_watermark_relative_value.stdout, 'expected': rabbitmq_custom_values.vm_memory_high_watermark}})
|
||||
| combine({'cluster_keepalive_interval': {'real': cluster_keepalive_interval_value.stdout, 'expected': rabbitmq_custom_values.cluster_keepalive_interval}})
|
||||
}}
|
||||
@@ -45,6 +45,17 @@
|
||||
xray_erlang_package: "{{ check_erlang_package_result.files[0].path }}"
|
||||
when: check_erlang_package_result.matched > 0
|
||||
|
||||
- name: Import RabbitMQ release signing key
|
||||
become: yes
|
||||
ignore_errors: yes
|
||||
rpm_key:
|
||||
key: https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
|
||||
state: present
|
||||
register: import_rabbitmq_signing_key_result
|
||||
until: import_rabbitmq_signing_key_result is succeeded
|
||||
delay: 5
|
||||
retries: 3
|
||||
|
||||
- name: Install erlang package
|
||||
become: yes
|
||||
yum:
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
- name: Get rabbitmq ha cluster status
|
||||
become: yes
|
||||
ignore_errors: yes
|
||||
shell: |
|
||||
./rabbitmqctl --erlang-cookie {{ xray_rabbitmq_default_cookie }} \
|
||||
--formatter json cluster_status | jq .
|
||||
args:
|
||||
chdir: "{{ xray_home }}/app/third-party/rabbitmq/sbin/"
|
||||
environment:
|
||||
LC_ALL: en_US.UTF-8
|
||||
LC_CTYPE: en_US.UTF-8
|
||||
register: ha_rabbitmq_cluster_status
|
||||
@@ -1,6 +1,4 @@
|
||||
- debug:
|
||||
msg: "Performing upgrade of Xray version to {{ xray_version }}..."
|
||||
|
||||
---
|
||||
- name: Check if xray tar exists
|
||||
become: yes
|
||||
stat:
|
||||
@@ -30,11 +28,7 @@
|
||||
when: download_xray is succeeded
|
||||
|
||||
- name: stop xray
|
||||
become: yes
|
||||
systemd:
|
||||
name: "{{ xray_daemon }}"
|
||||
state: stopped
|
||||
when: download_xray.changed
|
||||
meta: flush_handlers
|
||||
|
||||
- name: Delete xray app
|
||||
become: yes
|
||||
@@ -88,6 +82,7 @@
|
||||
template:
|
||||
src: "rabbitmq.conf.j2"
|
||||
dest: "{{ xray_home }}/app/bin/rabbitmq/rabbitmq.conf"
|
||||
mode: 0644
|
||||
when:
|
||||
- download_xray.changed
|
||||
notify: restart xray
|
||||
@@ -103,6 +98,7 @@
|
||||
template:
|
||||
src: "{{ xray_system_yaml_template }}"
|
||||
dest: "{{ xray_home }}/var/etc/system.yaml"
|
||||
mode: 0644
|
||||
when:
|
||||
- xray_systemyaml is defined
|
||||
- xray_systemyaml|length > 0
|
||||
@@ -114,6 +110,7 @@
|
||||
template:
|
||||
src: installer-info.json.j2
|
||||
dest: "{{ xray_home }}/var/etc/info/installer-info.json"
|
||||
mode: 0644
|
||||
notify: restart xray
|
||||
|
||||
- name: Ensure permissions are correct
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# platform collection version
|
||||
platform_collection_version: 7.24.3
|
||||
platform_collection_version: 7.25.7
|
||||
|
||||
# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
|
||||
ansible_marketplace: galaxy
|
||||
|
||||
@@ -14,7 +14,7 @@ xray_installer_scenario:
|
||||
}
|
||||
- {
|
||||
"expecting": "please specify the ip address of this machine(?!.*Skipping prompt)",
|
||||
"sending": "{% if xray_ha_node_type is defined and xray_ha_node_type == 'master' %}{{ ansible_host }}{% else %}{{ ansible_host }}{% endif %}"
|
||||
"sending": "{{ ansible_host }}"
|
||||
}
|
||||
- {
|
||||
"expecting": "are you adding an additional node",
|
||||
|
||||
Reference in New Issue
Block a user