From b1ee6f6abb8be677702d4fd74caec28ebf144d5b Mon Sep 17 00:00:00 2001 From: bmeehan Date: Wed, 8 Nov 2023 20:38:31 +1100 Subject: [PATCH] ITPLT-3356 support opensearch config in confleunce.cfg.xml --- roles/confluence_config/defaults/main.yml | 2 ++ roles/confluence_config/templates/confluence.cfg.xml.j2 | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml index c3fc9c1..d9ea102 100644 --- a/roles/confluence_config/defaults/main.yml +++ b/roles/confluence_config/defaults/main.yml @@ -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_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}" +atl_opensearch_endpoint: "{{ lookup('env', 'ATL_OPENSEARCH_ENDPOINT') }}" + atl_catalina_opts: "" atl_catalina_opts_extra: >- -Datlassian.event.thread_pool_configuration.queue_size=4096 diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2 index fec620d..ed652d0 100644 --- a/roles/confluence_config/templates/confluence.cfg.xml.j2 +++ b/roles/confluence_config/templates/confluence.cfg.xml.j2 @@ -57,6 +57,11 @@ {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %} {{ atl_tomcat_contextpath }} {% endif %} - + {# Confluence versions 7.13 and newer #} + {% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %} + {{ atl_hazelcast_network_aws_iam_region }} + {{ atl_opensearch_endpoint }} + opensearch + {% endif %} \ No newline at end of file