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

DCD-434: Add injection of heap and additional JVM opts into BB environment.

Browse Source
This commit is contained in:
Steve Smith
2019-07-08 12:19:49 +10:00
parent 84e9377824
commit 81dbd67c11
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/aws_node_local.yml
View File

@@ -77,6 +77,7 @@ atl_jdbc_query_params_for_engine:
atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}{{ atl_jdbc_query_params_for_engine[atl_db_engine]| default('') }}" atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}{{ atl_jdbc_query_params_for_engine[atl_db_engine]| default('') }}"
atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP') or '2048m' }}" atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP') or '2048m' }}"
atl_jvm_opts: "{{ lookup('env', 'ATL_JVM_OPTS') or '' }}"
atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS') or '' }}" atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS') or '' }}"
atl_proxy_name: "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}" atl_proxy_name: "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}"
atl_proxy_port: "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}" atl_proxy_port: "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}"

5
roles/product_startup/molecule/bitbucket/playbook.yml
View File

@@ -8,11 +8,16 @@
atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
atl_product_home_shared: "{{ atl_product_home }}/shared" atl_product_home_shared: "{{ atl_product_home }}/shared"
atl_jvm_heap: "dummy_heap"
atl_jvm_opts: "dummy_opts"
atl_startup_systemd_params: atl_startup_systemd_params:
- "UMask=0027" - "UMask=0027"
- "LimitNOFILE=4096" - "LimitNOFILE=4096"
- "Environment=BITBUCKET_HOME={{ atl_product_home }}" - "Environment=BITBUCKET_HOME={{ atl_product_home }}"
- "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}"
- "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
- "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
atl_startup_exec_options: atl_startup_exec_options:
- "-fg" - "-fg"

3
roles/product_startup/molecule/bitbucket/tests/test_default.py
View File

@@ -12,3 +12,6 @@ def test_service_file(host):
assert f.contains("^UMask=0027$") assert f.contains("^UMask=0027$")
assert f.contains("^LimitNOFILE=4096$") assert f.contains("^LimitNOFILE=4096$")
assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$") assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$")
assert f.contains("^Environment=JVM_MINIMUM_MEMORY=dummy_heap$")
assert f.contains("^Environment=JVM_MAXIMUM_MEMORY=dummy_heap$")
assert f.contains("^Environment=JVM_SUPPORT_RECOMMENDED_ARGS=dummy_opts$")