DCD-1020: Move JRE home & binary location to group-vars.

group_vars/aws_node_local.yml

@@ -34,6 +34,9 @@ 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"
 
+atl_jre_home: "{{ 'java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
+atl_java_binary: "{{ atl_jre_home }}/bin/java"
+
 atl_product_logs_default: &logs_default
   - path: "{{ atl_product_installation_current }}/logs/*"
     type: product

roles/synchrony_config/defaults/main.yml

@@ -3,6 +3,5 @@
 # FIXME: Add others as map?
 atl_synchrony_cluster_type: "aws"
 
-atl_synchrony_java_binary: "{{ 'java' if atl_use_system_jdk else (atl_product_installation_current + '/jre/bin/java') }}"
 atl_synchrony_memory: "{{ lookup('env', 'ATL_SYNCHRONY_MEMORY') or '-Xmx2g' }}"
 atl_synchrony_stack_space: "{{ lookup('env', 'ATL_SYNCHRONY_STACK_SPACE') or '-Xss2048k' }}"

roles/synchrony_config/templates/atl.synchrony.j2

@@ -7,7 +7,7 @@ ATL_CONFLUENCE_SHARED_CONFIG_FILE="{{ atl_product_home_shared }}/confluence.cfg.
 ATL_SYNCHRONY_JAR_PATH="{{ atl_product_installation_current }}/confluence/WEB-INF/packages/synchrony-standalone.jar"
 
 AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}"
-_RUNJAVA="{{ atl_synchrony_java_binary }}"
+_RUNJAVA="{{ atl_java_binary }}"
 
 SYNCHRONY_DATABASE_USERNAME="{{ atl_jdbc_user }}"
 SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}"