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

ITPLT-3356 support opensearch config in confleunce.cfg.xml

Browse Source
This commit is contained in:
bmeehan
2023-11-08 20:38:31 +11:00
parent 1d2796f8f0
commit b1ee6f6abb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,8 @@ 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_opensearch_endpoint: "{{ lookup('env', 'ATL_OPENSEARCH_ENDPOINT') }}"
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

7
roles/confluence_config/templates/confluence.cfg.xml.j2
View File

@@ -57,6 +57,11 @@
{% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %} {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
<property name="confluence.webapp.context.path">{{ atl_tomcat_contextpath }}</property> <property name="confluence.webapp.context.path">{{ atl_tomcat_contextpath }}</property>
{% endif %} {% endif %}
{# Confluence versions 7.13 and newer #}
{% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
<property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property>
<property name="opensearch.http.url">{{ atl_opensearch_endpoint }}</property>
<property name="search.platform">opensearch</property>
{% endif %}
</properties> </properties>
</confluence-configuration> </confluence-configuration>