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

DCD-963: Use the ATL_DB_PREFERREDTESTQUERY parameter from Confluence AWS Quickstart

Browse Source
This commit is contained in:
Adam Brokes
2020-08-03 15:13:15 +10:00
parent cee79604e2
commit 951f0241ab
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ atl_db_idletestperiod: "{{ lookup('env', 'ATL_DB_IDLETESTPERIOD') or '100' }}"
atl_db_maxstatements: "{{ lookup('env', 'ATL_DB_MAXSTATEMENTS') or '0' }}" atl_db_maxstatements: "{{ lookup('env', 'ATL_DB_MAXSTATEMENTS') or '0' }}"
atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}" atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}" atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
atl_hazelcast_network_aws_tag_key: "Cluster" atl_hazelcast_network_aws_tag_key: "Cluster"
atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com" atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"

2
roles/confluence_config/templates/confluence.cfg.xml.j2
View File

@@ -24,7 +24,7 @@
<property name="hibernate.c3p0.max_statements">{{ atl_db_maxstatements }}</property> <property name="hibernate.c3p0.max_statements">{{ atl_db_maxstatements }}</property>
<property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property> <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
<property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property> <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
<property name="hibernate.c3p0.preferredTestQuery">select version();</property> <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
<property name="shared-home">{{ atl_product_home_shared }}</property> <property name="shared-home">{{ atl_product_home_shared }}</property>
<property name="confluence.cluster">true</property> <property name="confluence.cluster">true</property>