Merge remote-tracking branch 'origin/master' into feature/AZURE-211-add-sql-server-support-to-crow

group_vars/all.yml

@@ -9,7 +9,7 @@
 #
 #    https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
 
-java_version: "1.8.0"
+java_version: "8"
 postgres_version: "9.6"
 git_version: "2.14.4"
 atl_shared_mountpoint: "/media/atl"
@@ -34,6 +34,14 @@ atl_product_installation_versioned: "{{ atl_product_installation_base }}/{{ atl_
 atl_product_installation_current: "{{ atl_product_installation_base }}/current"
 atl_installer_temp: "{{ atl_installation_base }}/tmp"
 
+# NOTE: If using the non-installer java we expect to have the full JDK
+# installed and linked to `/usr/lib/jvm/java` and # `/usr/lib/jvm/jre`.
+# See product_common/task/ubuntu.yml for an example of apropriate
+# linking using `alternatives`.
+atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
+atl_jre_home: "{{ '/usr/lib/jvm/jre' if atl_use_system_jdk else atl_java_home }}"
+atl_java_binary: "{{ atl_jre_home }}/bin/java"
+
 atl_product_logs_default: &logs_default
   - path: "{{ atl_product_installation_current }}/logs/*"
     type: product