From 9e6eb4173417ae4225c97e89888ffa180dbac53c Mon Sep 17 00:00:00 2001
From: Varun Arbatti <varbatti@atlassian.com>
Date: Wed, 28 Aug 2019 09:58:51 +1000
Subject: [PATCH] DCD-621: externalizes db type based in dbconfig.xml for Jira

---
 roles/jira_config/defaults/main.yml                      | 1 +
 roles/jira_config/molecule/default/playbook.yml          | 1 +
 roles/jira_config/molecule/default/tests/test_default.py | 1 +
 roles/jira_config/templates/dbconfig.xml.j2              | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml
index 0a90817..776e44e 100644
--- a/roles/jira_config/defaults/main.yml
+++ b/roles/jira_config/defaults/main.yml
@@ -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'
diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml
index be14065..3270e74 100644
--- a/roles/jira_config/molecule/default/playbook.yml
+++ b/roles/jira_config/molecule/default/playbook.yml
@@ -23,6 +23,7 @@
     atl_db_removeabandonedtimeout: 1111
     atl_db_testwhileidle: 'false'
     atl_db_testonborrow: 'true'
+    atl_db_type: 'postgres96'
 
   roles:
     - role: linux_common
diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py
index 58b83f9..4626e4e 100644
--- a/roles/jira_config/molecule/default/tests/test_default.py
+++ b/roles/jira_config/molecule/default/tests/test_default.py
@@ -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>")
diff --git a/roles/jira_config/templates/dbconfig.xml.j2 b/roles/jira_config/templates/dbconfig.xml.j2
index 18c9ed7..8ae7e81 100644
--- a/roles/jira_config/templates/dbconfig.xml.j2
+++ b/roles/jira_config/templates/dbconfig.xml.j2
@@ -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>