[jfrog-platform] 7.25.7 release (#159)

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/defaults/main.yml

@@ -1,7 +1,7 @@
 # defaults file for mc
 
 # The version of missioncontrol to install
-missioncontrol_version: 4.7.10
+missioncontrol_version: 4.7.14
 
 # whether to enable HA
 mc_ha_enabled: false
@@ -44,7 +44,6 @@ mc_es_conf_base: "/etc/elasticsearch"
 mc_es_user: admin
 mc_es_password: admin
 mc_es_url: "http://localhost:9200"
-mc_es_base_url: "http://localhost:9200/elasticsearch"
 mc_es_transport_port: 9300
 
 mc_es_home: "/usr/share/elasticsearch"

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/handlers/main.yml

@@ -5,3 +5,9 @@
   systemd:
     name: "{{ mc_daemon }}"
     state: restarted
+
+- name: stop missioncontrol
+  become: yes
+  systemd:
+    name: "{{ mc_daemon }}"
+    state: stopped

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/meta/main.yml

@@ -1,16 +1,27 @@
+---
+dependencies: []
+
 galaxy_info:
   author: "JFrog Maintainers Team <installers@jfrog.com>"
   description: "The missioncontrol role will install missioncontrol 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:
     - missioncontrol
-    - jfrog
-
-dependencies: []
+    - jfrog

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/expect.yml

@@ -42,3 +42,4 @@
     executable: /usr/bin/expect
     chdir: "{{ exp_dir }}"
   register: exp_result
+  changed_when: false

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/install.yml

@@ -1,6 +1,3 @@
-- debug:
-    msg: "Performing installation of missionControl version - {{ missioncontrol_version }}"
-
 - name: Install prerequisite packages
   include_tasks: "{{ ansible_os_family }}.yml"
 
@@ -56,7 +53,10 @@
 
 - name: Copy untar directory to mc home
   become: yes
-  command: "cp -r {{ mc_untar_home }}/. {{ mc_home }}"
+  copy:
+    src: "{{ mc_untar_home }}/"
+    dest: "{{ mc_home }}"
+    remote_src: yes
   when: not app_dir_check.stat.exists
 
 - name: Create required directories
@@ -140,7 +140,7 @@
 
 - name: Install mc as a service
   become: yes
-  shell: "{{ mc_archive_service_cmd }}"
+  command: "{{ mc_archive_service_cmd }}"
   args:
     chdir: "{{ mc_install_script_path }}"
     creates: "{{ mc_service_file }}"

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-elasticsearch.yml

@@ -19,7 +19,6 @@
   file:
     path: "{{ item }}"
     state: directory
-    mode: 0755
     recurse: yes
     owner: elasticsearch
     group: elasticsearch
@@ -67,7 +66,7 @@
     mc_elasticsearch_package: "{{ check_elasticsearch_package_result.files[0].path }}"
   when: check_elasticsearch_package_result.matched > 0
 
-- name: Ensure /usr/share/elasticsearch  exists
+- name: Ensure elasticsearch home exists
   become: yes
   file:
     path: "{{ mc_es_home }}"
@@ -92,7 +91,10 @@
 
 - name: Copy elasticsearch config files to ES_PATH_CONF dir
   become: yes
-  command: "cp -r {{ mc_es_home }}/config/. {{ mc_es_conf_base }}/"
+  copy:
+    src: "{{ mc_es_home }}/config/"
+    dest: "{{ mc_es_conf_base }}"
+    remote_src: yes
   when: unarchive_result.changed
 
 - name: Remove elasticsearch config dir
@@ -110,6 +112,7 @@
     dest: "{{ mc_es_conf_base }}/elasticsearch.yml"
     owner: elasticsearch
     group: elasticsearch
+    mode: 0644
   when: unarchive_result.extract_results.rc | default(128) == 0
 
 - name: Generate elasticsearch.yml template file
@@ -119,6 +122,7 @@
     dest: "{{ mc_es_conf_base }}/elasticsearch.yml"
     owner: elasticsearch
     group: elasticsearch
+    mode: 0644
   when: unarchive_result.extract_results.rc | default(128) == 0
 
 - name: Create empty unicast_hosts.txt file
@@ -126,9 +130,9 @@
   file:
     path: "{{ mc_es_conf_base }}/unicast_hosts.txt"
     state: touch
-    mode: 0664
     owner: elasticsearch
     group: elasticsearch
+    mode: 0664
 
 - name: Setup searchguard plugin
   import_tasks: setup-searchguard.yml
@@ -138,7 +142,6 @@
   file:
     path: "{{ item }}"
     state: directory
-    mode: 0755
     recurse: yes
     owner: elasticsearch
     group: elasticsearch
@@ -150,7 +153,7 @@
 
 - name: Start elasticsearch
   become: yes
-  shell: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
+  command: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
   environment:
     ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"
@@ -179,4 +182,4 @@
   environment:
     JAVA_HOME: "{{ mc_es_java_home }}"
   register: install_searchguard_result
-  when: check_searchguard_bundle_result.matched == 1
+  when: check_searchguard_bundle_result.matched == 1

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-elasticsearch.yml

@@ -8,6 +8,7 @@
         echo "$(ps -ef | grep -v grep | grep ${curr_ps_id})"
         kill -9 ${curr_ps_id}
     done
+  changed_when: false
 
 - name: Find searchguard bundle for removal
   become: yes
@@ -41,9 +42,9 @@
   file:
     path: "{{ mc_es_home }}"
     state: directory
-    mode: 0755
     owner: elasticsearch
     group: elasticsearch
+    mode: 0755
 
 - name: Find elasticsearch package
   become: yes
@@ -61,7 +62,6 @@
 
 - name: Extract elasticsearch package
   become: yes
-  ignore_errors: yes
   unarchive:
     src: "{{ mc_elasticsearch_package }}"
     dest: "{{ mc_es_home }}"
@@ -83,6 +83,7 @@
     dest: "{{ mc_es_conf_base }}/elasticsearch.yml"
     owner: elasticsearch
     group: elasticsearch
+    mode: 0644
   when: unarchive_result.extract_results.rc | default(128) == 0
 
 - name: Create empty unicast_hosts.txt file
@@ -90,16 +91,16 @@
   file:
     path: "{{ mc_es_conf_base }}/unicast_hosts.txt"
     state: touch
-    mode: 0644
     owner: elasticsearch
     group: elasticsearch
+    mode: 0644
 
 - name: Upgrade searchguard plugin
   import_tasks: upgrade-searchguard.yml
 
 - name: Start elasticsearch
   become: yes
-  shell: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
+  command: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
   environment:
     ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade.yml

@@ -1,6 +1,4 @@
-- debug:
-    msg: "Performing Upgrade of missionControl version - {{ missioncontrol_version }}"
-
+---
 - name: Check if mc tar exists
   become: yes
   stat:
@@ -29,12 +27,8 @@
     creates: "{{ mc_untar_home }}"
   when: download_mc is succeeded
 
-- name: Stop mc service
-  become: yes
-  systemd:
-    name: "{{ mc_daemon }}"
-    state: stopped
-  when: download_mc.changed
+- name: stop missioncontrol
+  meta: flush_handlers
 
 - name: Delete current app folder
   become: yes
@@ -105,6 +99,7 @@
   template:
     src: installer-info.json.j2
     dest: "{{ mc_home }}/var/etc/info/installer-info.json"
+    mode: 0644
   notify: restart missioncontrol
 
 - name: Update correct permissions

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/vars/main.yml

@@ -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