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

Merged in DCD-963-add-support-for-test-query (pull request #108)

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

Approved-by: Ben Partridge
Approved-by: Dylan Rathbone
This commit is contained in:
Adam Brokes
2020-08-05 03:58:47 +00:00
parent cee79604e2 09c0a49341
commit 1560571c08
4 changed files with 5 additions and 2 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"

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

@@ -18,6 +18,7 @@
atl_tomcat_scheme: "http" atl_tomcat_scheme: "http"
atl_proxy_name: "localhost" atl_proxy_name: "localhost"
atl_proxy_port: "80" atl_proxy_port: "80"
atl_db_preferredtestquery: "select 1;"
roles: roles:
- role: linux_common - role: linux_common

3
roles/confluence_config/molecule/default/tests/test_default.py
View File

@@ -77,4 +77,5 @@ def test_confluence_config_file(host):
assert f.contains('<property name="hibernate.connection.driver_class">org.postgresql.Driver</property>') assert f.contains('<property name="hibernate.connection.driver_class">org.postgresql.Driver</property>')
assert f.contains('<property name="confluence.cluster.aws.host.header">ec2.amazonaws.com</property>') assert f.contains('<property name="confluence.cluster.aws.host.header">ec2.amazonaws.com</property>')
assert f.contains('<property name="hibernate.connection.url">jdbc:postgresql://postgres-db.ap-southeast-2.rds.amazonaws.com:5432/confluence</property>') assert f.contains('<property name="hibernate.connection.url">jdbc:postgresql://postgres-db.ap-southeast-2.rds.amazonaws.com:5432/confluence</property>')
assert f.contains('<property name="hibernate.connection.password">molecule_password</property>') assert f.contains('<property name="hibernate.connection.password">molecule_password</property>')
assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')

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>