Merged in ITPLT-3356-cfn---create-opensearch-optio (pull request #207)

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

Approved-by: Vadym Kovalskiy
Approved-by: Lee Goolsbee

.pre-commit-config.yaml

@@ -0,0 +1,36 @@
+---
+default_install_hook_types: [pre-commit, prepare-commit-msg]
+default_stages: [pre-commit]
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-yaml
+      - id: detect-private-key
+        exclude: '(vault.yml.template|filter_catalina.yaml.j2)'
+      - id: trailing-whitespace
+  - repo: https://github.com/avilaton/add-msg-issue-prefix-hook
+    rev: v0.0.9
+    hooks:
+      - id: add-msg-issue-prefix
+        args:
+          - --template={}
+          - --pattern=[a-zA-Z0-9]{1,10}-[0-9]{1,6}
+  - repo: https://github.com/ansible/ansible-lint.git
+    rev: v6.12.2
+    hooks:
+      - id: ansible-lint
+        additional_dependencies:
+          - .
+          - ansible-core==2.13.10
+          - jmespath
+        language_version: python3.8
+  - repo: https://github.com/IamTheFij/ansible-pre-commit.git
+    rev: v0.1.2
+    hooks:
+      - id: encryption-check
+        always_run: true
+        files: vault.ya?ml$
+

roles/confluence_config/defaults/main.yml

@@ -19,6 +19,10 @@ 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_opensearch_password: "{{ lookup('env', 'ATL_OPENSEARCH_PASSWORD') }}"
+atl_opensearch_user: "{{ lookup('env', 'ATL_OPENSEARCH_USER') }}"
+
 atl_catalina_opts: ""
 atl_catalina_opts_extra: >-
   -Datlassian.event.thread_pool_configuration.queue_size=4096

roles/confluence_config/templates/confluence.cfg.xml.j2

@@ -26,7 +26,7 @@
     {% endif -%}
 
     {# Confluence versions 7.13 and newer #}
-    {% if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 %}
+    {%- if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 -%}
     <property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
     <property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>
@@ -35,7 +35,7 @@
     <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
     <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
     <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
-    {% else %}
+    {%- else -%}
     <property name="hibernate.hikari.idleTimeout">{{ atl_db_timeout }}</property>
     <property name="hibernate.hikari.maximumPoolSize">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.hikari.minimumIdle">{{ atl_db_poolminsize }}</property>
@@ -54,9 +54,24 @@
     <property name="confluence.cluster.join.type">aws</property>
     <property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property>
     <property name="confluence.cluster.ttl">1</property>
-    {% 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>
     {% endif %}
+    {# config specific to opensearch #}
+    {%- if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %}
+    {# 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.username">{{ 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>
+    {%- endif %}
 
   </properties>
 </confluence-configuration>