From 20f38cc26a5f33744247821e0355d2e87ca53cf5 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Tue, 30 Sep 2025 11:48:15 +1000
Subject: [PATCH 1/4] ITSD-487185 Add OpenSearch configuration to Jira
 jira-config.properties

---
 roles/jira_config/defaults/main.yml |  5 +++++
 roles/jira_config/tasks/main.yml    | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml
index 5aab24b..b6f42ef 100644
--- a/roles/jira_config/defaults/main.yml
+++ b/roles/jira_config/defaults/main.yml
@@ -39,3 +39,8 @@ atl_db_removeabandoned: 'true'
 atl_db_removeabandonedtimeout: '300'
 atl_db_testwhileidle: 'true'
 atl_db_testonborrow: 'false'
+
+# OpenSearch configuration
+atl_opensearch_endpoint: "{{ lookup('env', 'ATL_OPENSEARCH_ENDPOINT') }}"
+atl_opensearch_password: "{{ lookup('env', 'ATL_OPENSEARCH_PASSWORD') }}"
+atl_opensearch_user: "{{ lookup('env', 'ATL_OPENSEARCH_USER') }}"
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index c9476a9..9b115a2 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -33,6 +33,23 @@
     mode: 0644
   when: jira_config_properties.stat.exists
 
+- name: Configure OpenSearch settings in jira-config.properties
+  ansible.builtin.lineinfile:
+    path: "{{ atl_product_home }}/jira-config.properties"
+    create: true
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+    mode: 0644
+    line: "{{ item }}"
+  with_items:
+    - "search.platform=opensearch"
+    - "opensearch.http.url={{ atl_opensearch_endpoint }}"
+    - "opensearch.aws.region={{ atl_aws_region }}"
+    - "jira.search.api.reindex.bulk.request.size=10"
+  when:
+    - atl_opensearch_endpoint is defined and atl_opensearch_endpoint | length > 0
+    - atl_aws_region is defined
+
 - name: Override JVM memory settings.
   # Ugly but necessary as the product installs this file so we need to make the change here.
   ansible.builtin.lineinfile:

From 402c3d414f6fda76c0715ea36255e25748a3c335 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Tue, 30 Sep 2025 13:45:29 +1000
Subject: [PATCH 2/4] ITSD-487185 atl_aws_region was empty - need alternative

---
 roles/jira_config/tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 9b115a2..69f6a03 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -44,11 +44,11 @@
   with_items:
     - "search.platform=opensearch"
     - "opensearch.http.url={{ atl_opensearch_endpoint }}"
-    - "opensearch.aws.region={{ atl_aws_region }}"
+    - "opensearch.aws.region={{ atl_aws_region | default(ansible_ec2_placement_region) }}"
     - "jira.search.api.reindex.bulk.request.size=10"
   when:
     - atl_opensearch_endpoint is defined and atl_opensearch_endpoint | length > 0
-    - atl_aws_region is defined
+    - (atl_aws_region is defined or ansible_ec2_placement_region is defined)
 
 - name: Override JVM memory settings.
   # Ugly but necessary as the product installs this file so we need to make the change here.

From 4a6189a802ec400e177c58778d72943826ccad0a Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Tue, 30 Sep 2025 14:04:52 +1000
Subject: [PATCH 3/4] ITSD-487185 testing region

---
 roles/jira_config/tasks/main.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 69f6a03..b438b45 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -44,11 +44,10 @@
   with_items:
     - "search.platform=opensearch"
     - "opensearch.http.url={{ atl_opensearch_endpoint }}"
-    - "opensearch.aws.region={{ atl_aws_region | default(ansible_ec2_placement_region) }}"
-    - "jira.search.api.reindex.bulk.request.size=10"
+    - "opensearch.aws.region={{ ansible_ec2_placement_region }}"
   when:
     - atl_opensearch_endpoint is defined and atl_opensearch_endpoint | length > 0
-    - (atl_aws_region is defined or ansible_ec2_placement_region is defined)
+    - ansible_ec2_placement_region is defined
 
 - name: Override JVM memory settings.
   # Ugly but necessary as the product installs this file so we need to make the change here.

From 35744ee9995b948a2bfb3fe96d6312362f3fabe9 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Tue, 7 Oct 2025 11:10:57 +1100
Subject: [PATCH 4/4] ITSD-487185 Slight change for readability

---
 roles/jira_config/tasks/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index b438b45..6edc68d 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -46,7 +46,9 @@
     - "opensearch.http.url={{ atl_opensearch_endpoint }}"
     - "opensearch.aws.region={{ ansible_ec2_placement_region }}"
   when:
-    - atl_opensearch_endpoint is defined and atl_opensearch_endpoint | length > 0
+    - atl_opensearch_endpoint is defined
+    - atl_opensearch_endpoint is not none
+    - atl_opensearch_endpoint | length > 0
     - ansible_ec2_placement_region is defined
 
 - name: Override JVM memory settings.