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

ITOPSENG-277 only write synchrony.service.url if it has a value(in the right place this time)

Browse Source
This commit is contained in:
Brett Meehan
2019-11-26 09:20:06 +11:00
parent 3feeec1185
commit 49066285a8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS
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_catalina_opts: "" atl_catalina_opts: ""
atl_synchrony_url: "{% if atl_synchrony_service_url|length %}-Dsynchrony.service.url={{ atl_synchrony_service_url }}{% endif %}"
atl_catalina_opts_extra: >- atl_catalina_opts_extra: >-
-Datlassian.event.thread_pool_configuration.queue_size=4096 -Datlassian.event.thread_pool_configuration.queue_size=4096
-Datlassian.plugins.enable.wait=300 -Datlassian.plugins.enable.wait=300
@@ -28,9 +29,9 @@ atl_catalina_opts_extra: >-
-XX:+PrintGCDetails -XX:+PrintGCDetails
-XX:+PrintTenuringDistribution -XX:+PrintTenuringDistribution
-Dsynchrony.proxy.enabled=false -Dsynchrony.proxy.enabled=false
-Dsynchrony.service.url={{ atl_synchrony_service_url }}
-Dconfluence.cluster.node.name={{ atl_local_ipv4 }} -Dconfluence.cluster.node.name={{ atl_local_ipv4 }}
-Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60 -Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60
{% if atl_synchrony_service_url|length %}-Dsynchrony.service.url={{ atl_synchrony_service_url }}{% endif %}
atl_tomcat_port: "8080" atl_tomcat_port: "8080"
atl_tomcat_mgmt_port: "8005" atl_tomcat_mgmt_port: "8005"

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

@@ -19,9 +19,7 @@ ATL_SYNCHRONY_JVM_PROPERTIES="{{ atl_synchrony_stack_space }} {{ atl_synchrony_m
-Dsynchrony.cluster.bind={{ atl_local_ipv4 }} \ -Dsynchrony.cluster.bind={{ atl_local_ipv4 }} \
-Dcluster.interfaces={{ atl_local_ipv4 }} \ -Dcluster.interfaces={{ atl_local_ipv4 }} \
-Dsynchrony.cluster.base.port=25500 \ -Dsynchrony.cluster.base.port=25500 \
{% if atl_synchrony_service_url|length %}
-Dsynchrony.service.url={{ atl_synchrony_service_url }} \ -Dsynchrony.service.url={{ atl_synchrony_service_url }} \
{% endif %}
-Dsynchrony.context.path=/synchrony \ -Dsynchrony.context.path=/synchrony \
-Dsynchrony.port=8091 \ -Dsynchrony.port=8091 \
-Dcluster.name=Synchrony-Cluster \ -Dcluster.name=Synchrony-Cluster \