[ansible] JFrog Platform 7.18.6 (#110)

Ansible/ansible/ansible_collections/jfrog/platform/CHANGELOG.md

@@ -0,0 +1,14 @@
+# JFrog Platform Ansible Collection Changelog
+All changes to this collection will be documented in this file.
+
+## [7.8.6] - May 10, 2021
+* Fixed broken URLs in ansible galaxy - [108](https://github.com/jfrog/JFrog-Cloud-Installers/issues/108)
+* Added option to configure system.yaml (using `<product>_systemyaml` variable)  and binarystore.xml (using `artifactory_binarystore` variable)
+
+## [7.8.5] - May 3, 2021
+* Added new `jfrog.platform` collection with Artifactory, Distribution, Missioncontrol and Xray roles
+* `jfrog.platform` galaxy [collection] (https://galaxy.ansible.com/jfrog/platform) release
+* Added new `groups_vars/all/package_version.yml` file to define product versions
+* Added global support for masterKey and joinKey values in `groups_vars/all/vars.yml`
+* **IMPORTANT**
+* Previous 1.x.x jfrog.installer [deprecated collection](https://github.com/jfrog/JFrog-Cloud-Installers/tree/ansible-v1.1.2/Ansible/ansible_collections/jfrog/installers) 

Ansible/ansible/ansible_collections/jfrog/platform/README.md

@@ -8,7 +8,7 @@ This Ansible directory consists of the following directories that support the JF
 
  ## Getting Started
  
- 1. Install this collection from Ansible Galaxy. This collection is also available in RedHat Automation Hub.
+ 1. Install this collection from Ansible Galaxy.
     
     ```
     ansible-galaxy collection install jfrog.platform
@@ -108,5 +108,4 @@ The JFrog Platform Ansible Collection can be installed on the following operatin
 * By default, ansible_python_interpreter: "/usr/bin/python3" used , For Centos/RHEL-7, Set this to "/usr/bin/python" . For example
 ```
 ansible-playbook -vv platform.yml -i hosts.ini -e 'ansible_python_interpreter=/usr/bin/python'
-```
-
+```

Ansible/ansible/ansible_collections/jfrog/platform/ansible.cfg

@@ -2,5 +2,4 @@
 host_key_checking = false
 stdout_callback = debug
 remote_tmp = /tmp/.ansible/tmp
-private_key_file=~/.ssh/ansible-jfrog.key
-timeout = 20
+timeout = 20

Ansible/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: "7.18.5"
+version: "7.18.6"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: "README.md"
@@ -53,13 +53,13 @@ tags:
 dependencies: {}
 
 # The URL of the originating SCM repository
-repository: "https://github.com/jfrog/JFrog-Cloud-Installers/Ansible"
+repository: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible"
 
 # The URL to any online docs
-documentation: "https://github.com/jfrog/JFrog-Cloud-Installers/blob/master/Ansible/README.md"
+documentation: "https://github.com/jfrog/JFrog-Cloud-Installers/blob/master/Ansible/ansible_collections/jfrog/platform/README.md"
 
 # The URL to the homepage of the collection/project
-homepage: "https://github.com/jfrog/JFrog-Cloud-Installers/Ansible"
+homepage: "https://github.com/jfrog/JFrog-Cloud-Installers/tree/master/Ansible/ansible_collections/jfrog/platform"
 
 # The URL to the collection issue tracker
 issues: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"

Ansible/ansible/ansible_collections/jfrog/platform/group_vars/all/package_version.yml

@@ -1,8 +1,8 @@
 # The version of products to install
-artifactory_version: 7.18.5
+artifactory_version: 7.18.6
 xray_version: 3.24.2
 distribution_version: 2.7.1
 missioncontrol_version: 4.7.3
 
 # platform collection version
-platform_collection_version: 7.18.5
+platform_collection_version: 7.18.6

Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml

@@ -6,10 +6,13 @@ ansible_marketplace: standalone
 # 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
 
+# Set this to false when ngnix is disabled, defaults to true (implies artifactory uses artifactory_nginx role )
+artifactory_nginx_enabled: true
+
 # Provide single node license
 # artifactory_single_license:
 
-# Provide individual (HA) licenses file separated by new line and set artifactory_ha_enabled: true.
+# Provide individual (HA) licenses file separated by new line and 2-space indentation and set artifactory_ha_enabled: true.
 # Example:
 # artifactory_licenses: |-
 #   <license_1>
@@ -17,7 +20,7 @@ artifactory_nginx_ssl_enabled: false
 #   <license_2>
 
 #   <license_3>
-  
+
 # To enable HA, set to true
 artifactory_ha_enabled: false
 
@@ -55,3 +58,31 @@ artifactory_upgrade_only: false
 #default username and password
 artifactory_admin_username: admin
 artifactory_admin_password: password
+
+
+# Provide binarystore XML content below with 2-space indentation
+artifactory_binarystore: |-
+  <?xml version="1.0" encoding="UTF-8"?>
+  <config version="2">
+      <chain template="cluster-file-system"/>
+  </config>
+
+# Provide systemyaml content below with 2-space indentation
+artifactory_systemyaml: |-
+  configVersion: 1
+  shared:
+    extraJavaOpts: "{{ artifactory_extra_java_opts }}"
+    node:
+      id: {{ ansible_hostname }}
+      ip: {{ ansible_host }}
+      taskAffinity: {{ artifactory_taskAffinity }}
+      haEnabled: {{ artifactory_ha_enabled }}
+    database:
+      type: "{{ artifactory_db_type }}"
+      driver: "{{ artifactory_db_driver }}"
+      url: "{{ artifactory_db_url }}"
+      username: "{{ artifactory_db_user }}"
+      password: "{{ artifactory_db_password }}"
+  router:
+    entrypoints:
+      internalPort: 8046

Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml

@@ -5,7 +5,7 @@
 - name: install nginx
   include_role:
     name: artifactory_nginx
-  when: artifactory_nginx_ssl_enabled == false
+  when: artifactory_nginx_enabled == true
 
 - name: install nginx with SSL
   include_role:

Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/binarystore.xml.j2

@@ -0,0 +1,3 @@
+{% if (artifactory_binarystore) and (artifactory_binarystore|length > 0) %}
+{{ artifactory_binarystore }}
+{% endif %}

Ansible/ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/system.yaml.j2

@@ -0,0 +1,3 @@
+{% if (artifactory_systemyaml) and (artifactory_systemyaml|length > 0) %}
+{{ artifactory_systemyaml }}
+{% endif %}

Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml

@@ -41,3 +41,26 @@ distribution_redis_password: password
 distribution_upgrade_only: false
 
 distribution_system_yaml_template: system.yaml.j2
+
+# Provide systemyaml content below with 2-space indentation
+distribution_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ distribution_db_type }}"
+      driver: "{{ distribution_db_driver }}"
+      url: "{{ distribution_db_url }}"
+      username: "{{ distribution_db_user }}"
+      password: "{{ distribution_db_password }}"
+    redis:
+      connectionString: "{{ distribution_redis_url }}"
+      password: "{{ distribution_redis_password }}"
+    security:
+      joinKey: {{ join_key }}
+  router:
+    entrypoints:
+      internalPort: 8046

Ansible/ansible/ansible_collections/jfrog/platform/roles/distribution/templates/system.yaml.j2

@@ -0,0 +1,3 @@
+{% if (distribution_systemyaml) and (distribution_systemyaml|length > 0) %}
+{{ distribution_systemyaml }}
+{% endif %}

Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/README.md

@@ -1,4 +1,4 @@
-# MissionControl
+# Missioncontrol
 The missioncontrol role will install missioncontrol software onto the host. An Artifactory server and Postgress database is required.
 
 ### Role Variables

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

@@ -56,3 +56,41 @@ flow_type: archive
 mc_upgrade_only: false
 
 mc_system_yaml_template: system.yaml.j2
+
+# Provide systemyaml content below with 2-space indentation
+mc_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ mc_db_type }}"
+      driver: "{{ mc_db_driver }}"
+      url: "{{ mc_db_url }}"
+    elasticsearch:
+      unicastFile: {{ mc_es_conf_base }}/config/unicast_hosts.txt
+      password: {{ mc_es_password }}
+      url: {{ mc_es_url }}
+      username: {{ mc_es_user }}
+    security:
+      joinKey: {{ join_key }}
+  mc:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "jfmc_server"
+  insight-scheduler:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "insight_scheduler"
+  insight-server:
+    database:
+      username: "{{ mc_db_user }}"
+      password: "{{ mc_db_password }}"
+      schema: "insight_server"
+  router:
+    entrypoints:
+      internalPort: 8046

Ansible/ansible/ansible_collections/jfrog/platform/roles/missioncontrol/templates/system.yaml.j2

@@ -0,0 +1,3 @@
+{% if (mc_systemyaml) and (mc_systemyaml|length > 0) %}
+{{ mc_systemyaml }}
+{% endif %}

Ansible/ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml

@@ -75,3 +75,30 @@ yum_python_interpreter: >-
     {%- else -%}
         /usr/bin/python3
     {%- endif -%}
+
+# Provide systemyaml content below with 2-space indentation
+xray_systemyaml: |-
+  configVersion: 1
+  shared:
+    jfrogUrl: {{ jfrog_url }}
+    node:
+      ip: {{ ansible_host }}
+      id: {{ ansible_hostname }}
+    database:
+      type: "{{ xray_db_type }}"
+      driver: "{{ xray_db_driver }}"
+      url: "{{ xray_db_url }}"
+      username: "{{ xray_db_user }}"
+      password: "{{ xray_db_password }}"
+    rabbitMq:
+      autoStop: true
+      erlangCookie:
+        value: "{{ xray_rabbitmq_default_cookie }}"
+      url: "{{ xray_rabbitmq_url }}"
+      username: "{{ xray_rabbitmq_user }}"
+      password: "{{xray_rabbitmq_password }}"
+    security:
+      joinKey: {{ join_key }}
+  router:
+    entrypoints:
+      internalPort: 8046