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

Merge remote-tracking branch 'origin/master' into feature/AZURE-211-add-sql-server-support-to-crow

Browse Source
This commit is contained in:
dbacon
2020-08-24 11:01:59 +01:00
parent b036c3cf9b 1d86a0ddb9
commit 8bb2194699
6 changed files with 7 additions and 3 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>

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

@@ -3,5 +3,6 @@
# FIXME: Add others as map? # FIXME: Add others as map?
atl_synchrony_cluster_type: "aws" atl_synchrony_cluster_type: "aws"
atl_synchrony_java_binary: "{{ 'java' if atl_use_system_jdk else (atl_product_installation_current + '/jre/bin/java') }}"
atl_synchrony_memory: "{{ lookup('env', 'ATL_SYNCHRONY_MEMORY') or '-Xmx2g' }}" atl_synchrony_memory: "{{ lookup('env', 'ATL_SYNCHRONY_MEMORY') or '-Xmx2g' }}"
atl_synchrony_stack_space: "{{ lookup('env', 'ATL_SYNCHRONY_STACK_SPACE') or '-Xss2048k' }}" atl_synchrony_stack_space: "{{ lookup('env', 'ATL_SYNCHRONY_STACK_SPACE') or '-Xss2048k' }}"

2
roles/synchrony_config/templates/atl.synchrony.j2
View File

@@ -7,7 +7,7 @@ ATL_CONFLUENCE_SHARED_CONFIG_FILE="{{ atl_product_home_shared }}/confluence.cfg.
ATL_SYNCHRONY_JAR_PATH="{{ atl_product_installation_current }}/confluence/WEB-INF/packages/synchrony-standalone.jar" ATL_SYNCHRONY_JAR_PATH="{{ atl_product_installation_current }}/confluence/WEB-INF/packages/synchrony-standalone.jar"
AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}" AWS_EC2_PRIVATE_IP="{{ atl_local_ipv4 }}"
_RUNJAVA="{{ atl_product_installation_current }}/jre/bin/java" _RUNJAVA="{{ atl_synchrony_java_binary }}"
SYNCHRONY_DATABASE_USERNAME="{{ atl_jdbc_user }}" SYNCHRONY_DATABASE_USERNAME="{{ atl_jdbc_user }}"
SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}" SYNCHRONY_DATABASE_PASSWORD="{{ atl_jdbc_password }}"