Updated/added READMEs. Changes to playbooks. Added license file, system yaml file, binary story file support.

Ansible/collection/README.md

@@ -32,10 +32,13 @@ The following Vars must be configured.
 * db_user: The database user to configure. eg. "artifactory"
 * db_password: The database password to configure. "Art1fact0ry"
 * server_name: This is the server name. eg. "artifactory.54.175.51.178.xip.io"
+* system_file: Your own system YAML file can be specified and used. If specified, this file will be used rather than constructing a file from the parameters above.
+* binary_store_file: Your own binary store file can be used. If specified, the default cluster-file-system will not be used.
 
 ### primary vars
 * artifactory_is_primary: For the primary node this must be set to **true**.
 * artifactory_license1 - 5: These are the cluster licenses.
+* artifactory_license_file: Your own license file can be used. If specified, a license file constructed from the licenses above will not be used.
 
 ### secondary vars
 * artifactory_is_primary: For the secondary node(s) this must be set to **false**.

Ansible/collection/jfrog/ansible/roles/artifactory/defaults/main.yml

@@ -6,7 +6,7 @@ ansible_marketplace: standalone
 # The version of Artifactory to install
 artifactory_version: 7.4.1
 
-# licenses
+# licenses file - specify a licenses file or specify up to 5 licenses
 artifactory_license1:
 artifactory_license2:
 artifactory_license3:
@@ -26,9 +26,6 @@ artifactory_download_directory: /opt/jfrog
 artifactory_file_store_dir: /data
 
 # Pick the Artifactory flavour to install, can be also cpp-ce, jcr, pro.
-# note that for "pro" version, the artifactory_zip URL would need to be overridden to e.g.:
-# https://dl.bintray.com/jfrog/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/jfrog-artifactory-pro-{{ artifactory_version }}.zip
-# https://dl.bintray.com/jfrog/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/jfrog-artifactory-pro-{{ artifactory_version }}-linux.tar.gz
 artifactory_flavour: pro
 
 extra_java_opts: -server -Xms2g -Xmx14g -Xss256k -XX:+UseG1GC

Ansible/collection/jfrog/ansible/roles/artifactory/tasks/main.yml

@@ -52,11 +52,19 @@
     group: "{{ artifactory_group }}"
   become: yes
 
+- name: use specified system yaml
+  copy:
+    src: "{{ system_file }}"
+    dest: "{{ artifactory_home }}/var/etc/system.yaml"
+  become: yes
+  when: system_file is defined
+
 - name: configure system yaml
   template:
     src: system.yaml.j2
     dest: "{{ artifactory_home }}/var/etc/system.yaml"
   become: yes
+  when: system_file is not defined
 
 - name: ensure {{ artifactory_home }}/var/etc/security/ exists
   file:
@@ -92,18 +100,33 @@
     dest: "{{ artifactory_home }}/var/etc/info/installer-info.json"
   become: yes
 
-- name: configure binary store
+- name: use specified binary store
+  copy:
+    src: "{{ binary_store_file }}"
+    dest: "{{ artifactory_home }}/var/etc/binarystore.xml"
+  become: yes
+  when: binary_store_file is defined
+
+- name: use default binary store
   template:
     src: binarystore.xml.j2
     dest: "{{ artifactory_home }}/var/etc/binarystore.xml"
   become: yes
+  when: binary_store_file is not defined
 
-- name: configure cluster license
+- name: use license file
+  copy:
+    src: "{{ artifactory_license_file }}"
+    dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.cluster.license"
+  become: yes
+  when: artifactory_license_file is defined and artifactory_is_primary == true
+
+- name: use license strings
   template:
     src: artifactory.cluster.license.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.cluster.license"
   become: yes
-  when: artifactory_is_primary == true
+  when: artifactory_license_file is not defined and artifactory_is_primary == true
 
 - name: download database driver
   get_url: