blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 08:53:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in ITOPSENG-771-fix-productdownloadurl (pull request #109)

Browse Source 
Synchrony nodes should use system JDK if configured to do so

Approved-by: Ben Partridge
This commit is contained in:
Lee Goolsbee
2020-08-14 18:41:52 +00:00
parent 1560571c08 5e661521d2
commit 1d86a0ddb9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/synchrony_config/defaults/main.yml
View File

@@ -3,5 +3,6 @@
# FIXME: Add others as map? # FIXME: Add others as map?
atl_synchrony_cluster_type: "aws" 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_memory: "{{ lookup('env', 'ATL_SYNCHRONY_MEMORY') or '-Xmx2g' }}"
atl_synchrony_stack_space: "{{ lookup('env', 'ATL_SYNCHRONY_STACK_SPACE') or '-Xss2048k' }}" atl_synchrony_stack_space: "{{ lookup('env', 'ATL_SYNCHRONY_STACK_SPACE') or '-Xss2048k' }}"

2
roles/synchrony_config/templates/atl.synchrony.j2
View File

@@ -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" ATL_SYNCHRONY_JAR_PATH="{{ atl_product_installation_current }}/confluence/WEB-INF/packages/synchrony-standalone.jar"
AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}" 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_USERNAME="{{ atl_jdbc_user }}"
SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}" SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}"