DCD-621: externalizes db type based in dbconfig.xml for Jira

This commit is contained in:
Varun Arbatti
2019-08-28 09:58:51 +10:00
parent d21e4abbe5
commit 9e6eb41734
4 changed files with 4 additions and 1 deletions

View File

@@ -26,6 +26,7 @@ atl_db_poolminsize: '20'
atl_db_poolmaxsize: '100'
atl_db_minidle: '10'
atl_db_maxidle: '20'
atl_db_type: 'postgres72'
atl_db_maxwaitmillis: '30000'
atl_db_timebetweenevictionrunsmillis: '30000'

View File

@@ -23,6 +23,7 @@
atl_db_removeabandonedtimeout: 1111
atl_db_testwhileidle: 'false'
atl_db_testonborrow: 'true'
atl_db_type: 'postgres96'
roles:
- role: linux_common

View File

@@ -10,6 +10,7 @@ def test_dbconfig_file(host):
f = host.file('/var/atlassian/application-data/jira/dbconfig.xml')
assert f.exists
assert f.user == 'jira'
assert f.contains("<database-type>postgres96</database-type>")
assert f.contains("<driver-class>org.postgresql.Driver</driver-class>")
assert f.contains("<username>atljira</username>")
assert f.contains("<password>molecule_password</password>")

View File

@@ -3,7 +3,7 @@
<jira-database-config>
<name>defaultDS</name>
<delegator-name>default</delegator-name>
<database-type>postgres72</database-type>
<database-type>{{ atl_db_type }}</database-type>
<schema-name>public</schema-name>
<jdbc-datasource>
<url>{{ atl_jdbc_url }}</url>