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

DCD-352: Move some vars shared by Confluence and Synchrony to a confluence_common role.

Browse Source
This commit is contained in:
Steve Smith
2019-05-28 13:35:36 +10:00
parent 63c6e4bf51
commit de9453b8ca
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aws_confluence_dc_node.yml
View File

@@ -15,5 +15,6 @@
- role: product_common - role: product_common
- role: product_install - role: product_install
- role: database_init - role: database_init
- role: confluence_common
- role: confluence_config - role: confluence_config
- role: product_startup - role: product_startup

1
roles/aws_common/tasks/main.yml
View File

@@ -11,3 +11,4 @@
- name: Use EC2 instance ID for cluster node ID - name: Use EC2 instance ID for cluster node ID
set_fact: set_fact:
atl_cluster_node_id: "{{ ansible_ec2_instance_id }}" atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }}"

9
roles/confluence_common/defaults/main.yml Normal file
View File

@@ -0,0 +1,9 @@
---
atl_hazelcast_network_aws_tag_key: "Cluster"
atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_REGION') }}"
atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"
atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
atl_synchrony_service_url: "{{ lookup('env', 'ATL_SYNCHRONY_SERVICE_URL') }}"

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

@@ -2,6 +2,8 @@
atl_jvm_heap: "2048m" atl_jvm_heap: "2048m"
atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
atl_db_timeout: "{{ lookup('env', 'ATL_DB_TIMEOUT') or '30' }}" atl_db_timeout: "{{ lookup('env', 'ATL_DB_TIMEOUT') or '30' }}"
atl_db_idletestperiod: "{{ lookup('env', 'ATL_DB_IDLETESTPERIOD') or '100' }}" 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' }}"
@@ -14,10 +16,6 @@ atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_A
atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}" atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"
atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}" atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
atl_synchrony_service_url: "{{ lookup('env', 'ATL_SYNCHRONY_SERVICE_URL') }}"
atl_catalina_opts: "" atl_catalina_opts: ""
atl_catalina_opts_extra: >- atl_catalina_opts_extra: >-
-Datlassian.event.thread_pool_configuration.queue_size=4096 -Datlassian.event.thread_pool_configuration.queue_size=4096
@@ -31,7 +29,7 @@ atl_catalina_opts_extra: >-
-XX:+PrintTenuringDistribution -XX:+PrintTenuringDistribution
-Dsynchrony.proxy.enabled=false -Dsynchrony.proxy.enabled=false
-Dsynchrony.service.url={{ atl_synchrony_service_url }} -Dsynchrony.service.url={{ atl_synchrony_service_url }}
-Dconfluence.cluster.node.name={{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }} -Dconfluence.cluster.node.name={{ atl_local_ipv4 }}
-Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60 -Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60
atl_tomcat_port: "8080" atl_tomcat_port: "8080"

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

@@ -10,11 +10,11 @@
atl_jvm_heap: 'PLACEHOLDER' atl_jvm_heap: 'PLACEHOLDER'
atl_cluster_node_id: 'FAKEID' atl_cluster_node_id: 'FAKEID'
atl_autologin_cookie_age: "COOKIEAGE" atl_autologin_cookie_age: "COOKIEAGE"
ansible_ec2_local_ipv4: "1.1.1.1" atl_local_ipv4: "1.1.1.1"
ansible_default_ipv4: "2.2.2.2"
roles: roles:
- role: linux_common - role: linux_common
- role: product_common - role: product_common
- role: product_install - role: product_install
- role: confluence_common
- role: confluence_config - role: confluence_config

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

@@ -64,3 +64,4 @@ def test_confluence_config_file(host):
assert f.user == 'confluence' assert f.user == 'confluence'
assert f.contains('<property name="confluence.cluster.home">/media/atl/confluence/shared-home</property>') assert f.contains('<property name="confluence.cluster.home">/media/atl/confluence/shared-home</property>')
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>')