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

---
 roles/confluence_config/defaults/main.yml               | 2 ++
 roles/confluence_config/templates/confluence.cfg.xml.j2 | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index d9ea102..d5ba7bc 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -20,6 +20,8 @@ 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_opensearch_endpoint: "{{ lookup('env', 'ATL_OPENSEARCH_ENDPOINT') }}"
+atl_opensearch_password: "{{ lookup('env', 'ATL_OPENSEARCH_PASSWORD') }}"
+atl_opensearch_user: "{{ lookup('env', 'ATL_OPENSEARCH_USER') }}"
 
 atl_catalina_opts: ""
 atl_catalina_opts_extra: >-
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index 656577e..1a707eb 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -59,9 +59,15 @@
     {% 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>
-    <property name="opensearch.http.url">{{ atl_opensearch_endpoint }}</property>
+    {% else %}
+    <property name="opensearch.password">{{ atl_opensearch_password }}</property>
+    <property name="opensearch.user">{{ atl_opensearch_user }}</property>
+    {% endif %}
+    <property name="opensearch.http.url">https://{{ atl_opensearch_endpoint }}</property>
     <property name="search.platform">opensearch</property>
     {% endif %}
+    {% endif %}
   </properties>
 </confluence-configuration>
\ No newline at end of file