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

Merged in QUICK-265-explicit-gc (pull request #27)

Browse Source 
QUICK-265: Add JVM opts parameter to Jira config role

Approved-by: Steve Smith
This commit is contained in:
Michael Kemp
2019-09-23 04:56:09 +00:00
parent dc988a9434 64b9925fbb
commit f7e74edd4a
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/jira_config/molecule/default/playbook.yml
View File

@@ -11,6 +11,7 @@
atl_jdbc_user: 'atljira' atl_jdbc_user: 'atljira'
atl_jdbc_password: 'molecule_password' atl_jdbc_password: 'molecule_password'
atl_jvm_heap: 'PLACEHOLDER' atl_jvm_heap: 'PLACEHOLDER'
atl_jvm_opts: 'PLACEHOLDER'
atl_cluster_node_id: 'FAKEID' atl_cluster_node_id: 'FAKEID'
atl_db_poolminsize: 1111 atl_db_poolminsize: 1111
atl_db_poolmaxsize: 1111 atl_db_poolmaxsize: 1111

1
roles/jira_config/molecule/default/tests/test_default.py
View File

@@ -38,6 +38,7 @@ def test_setenv_file(host):
assert f.contains('^JVM_MAXIMUM_MEMORY="PLACEHOLDER"') assert f.contains('^JVM_MAXIMUM_MEMORY="PLACEHOLDER"')
assert f.contains('^JIRA_HOME="/var/atlassian/application-data/jira"') assert f.contains('^JIRA_HOME="/var/atlassian/application-data/jira"')
assert f.contains('^export CATALINA_OPTS="') assert f.contains('^export CATALINA_OPTS="')
assert f.contains('^JVM_SUPPORT_RECOMMENDED_ARGS="PLACEHOLDER"')
def test_cluster_file(host): def test_cluster_file(host):

6
roles/jira_config/tasks/main.yml
View File

@@ -41,6 +41,12 @@
insertafter: "EOF" insertafter: "EOF"
line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"' line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
- name: Set support recommended JVM args
lineinfile:
path: "{{ atl_product_installation_versioned }}/bin/setenv.sh"
regexp: "JVM_SUPPORT_RECOMMENDED_ARGS="
line: 'JVM_SUPPORT_RECOMMENDED_ARGS="{{ atl_jvm_opts }}"'
- name: Create application directories - name: Create application directories
file: file:
path: "{{ item }}" path: "{{ item }}"