From da56d513e0656d04c019267e89e7827435b0352d Mon Sep 17 00:00:00 2001
From: bmeehan <bmeehan@atlassian.com>
Date: Fri, 8 Mar 2024 08:26:41 +1100
Subject: [PATCH] ITPLT-3356 add OS user and pass if provided and exclude
 region if OS pass provided

---
 roles/confluence_config/templates/confluence.cfg.xml.j2 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index 1a707eb..04d1130 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -59,11 +59,12 @@
     {% endif %}
     {# config specific to opensearch #}
     {% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
-    {% if atl_opensearch_password is defined and atl_opensearch_endpoint = '' %}
-    <property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property>
-    {% else %}
+    {# if password provided set password and user but NOT region #}
+    {% if atl_opensearch_password is defined and atl_opensearch_password != '' %}
     <property name="opensearch.password">{{ atl_opensearch_password }}</property>
     <property name="opensearch.user">{{ atl_opensearch_user }}</property>
+    {% else %}
+    <property name="opensearch.aws.region">{{ atl_hazelcast_network_aws_iam_region }}</property>
     {% endif %}
     <property name="opensearch.http.url">https://{{ atl_opensearch_endpoint }}</property>
     <property name="search.platform">opensearch</property>