diff --git a/roles/synchrony_config/defaults/main.yml b/roles/synchrony_config/defaults/main.yml index e6607e3..383d67c 100644 --- a/roles/synchrony_config/defaults/main.yml +++ b/roles/synchrony_config/defaults/main.yml @@ -3,5 +3,6 @@ # 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' }}" diff --git a/roles/synchrony_config/templates/atl.synchrony.j2 b/roles/synchrony_config/templates/atl.synchrony.j2 index e340fa3..bf36ba1 100644 --- a/roles/synchrony_config/templates/atl.synchrony.j2 +++ b/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_product_installation_current }}/jre/bin/java" +_RUNJAVA="{{ atl_synchrony_java_binary }}" SYNCHRONY_DATABASE_USERNAME="{{ atl_jdbc_user }}" SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}"