blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 08:53:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

ITPLT-3356 add OS user and pass if provided and exclude region if OS pass provided

Browse Source
This commit is contained in:
bmeehan
2024-03-08 08:09:52 +11:00
parent d49ad84da4
commit acc72cb739
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/confluence_config/defaults/main.yml
View File

@@ -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_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
atl_opensearch_endpoint: "{{ lookup('env', 'ATL_OPENSEARCH_ENDPOINT') }}" 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: ""
atl_catalina_opts_extra: >- atl_catalina_opts_extra: >-

8
roles/confluence_config/templates/confluence.cfg.xml.j2
View File

@@ -59,9 +59,15 @@
{% endif %} {% endif %}
{# config specific to opensearch #} {# config specific to opensearch #}
{% if atl_opensearch_endpoint is defined and atl_opensearch_endpoint != '' %} {% 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.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> <property name="search.platform">opensearch</property>
{% endif %} {% endif %}
{% endif %}
</properties> </properties>
</confluence-configuration> </confluence-configuration>