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

DCD-1157: Give elastic search IAM authentication boolean variable a better name

Browse Source
This commit is contained in:
Ben Partridge
2021-02-24 17:04:04 +11:00
parent 1280de7e1d
commit 99bb2dee54
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/bitbucket_config/defaults/main.yaml
View File

@@ -6,4 +6,4 @@ atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('
atl_elasticsearch_username: "{{ lookup('env', 'ATL_ELASTICSEARCH_USERNAME') }}" atl_elasticsearch_username: "{{ lookup('env', 'ATL_ELASTICSEARCH_USERNAME') }}"
atl_elasticsearch_password: "{{ lookup('env', 'ATL_ELASTICSEARCH_PASSWORD') }}" atl_elasticsearch_password: "{{ lookup('env', 'ATL_ELASTICSEARCH_PASSWORD') }}"
elasticsearch_auth_iam: "{{ atl_elasticsearch_username is not defined and atl_aws_region is defined }}" elasticsearch_should_auth_with_iam: "{{ atl_elasticsearch_username is not defined and atl_aws_region is defined }}"

2
roles/bitbucket_config/templates/bitbucket.properties.j2
View File

@@ -13,7 +13,7 @@ hazelcast.network.aws.tag.value={{ atl_aws_stack_name }}
hazelcast.group.name={{ atl_aws_stack_name }} hazelcast.group.name={{ atl_aws_stack_name }}
hazelcast.group.password={{ atl_aws_stack_name }} hazelcast.group.password={{ atl_aws_stack_name }}
plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }} plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }}
{% if elasticsearch_auth_iam == 'true' %} {% if elasticsearch_should_auth_with_iam == 'true' %}
plugin.search.elasticsearch.aws.region={{ atl_aws_region }} plugin.search.elasticsearch.aws.region={{ atl_aws_region }}
{% else %} {% else %}
plugin.search.elasticsearch.username={{ atl_elasticsearch_username }} plugin.search.elasticsearch.username={{ atl_elasticsearch_username }}