From 99bb2dee5434b9ad01c06f1a0cef79db25e23fbd Mon Sep 17 00:00:00 2001 From: Ben Partridge Date: Wed, 24 Feb 2021 17:04:04 +1100 Subject: [PATCH] DCD-1157: Give elastic search IAM authentication boolean variable a better name --- roles/bitbucket_config/defaults/main.yaml | 2 +- roles/bitbucket_config/templates/bitbucket.properties.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 0a1f114..9cdc3c7 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -6,4 +6,4 @@ atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject(' atl_elasticsearch_username: "{{ lookup('env', 'ATL_ELASTICSEARCH_USERNAME') }}" atl_elasticsearch_password: "{{ lookup('env', 'ATL_ELASTICSEARCH_PASSWORD') }}" -elasticsearch_auth_iam: "{{ atl_elasticsearch_username is not defined and atl_aws_region is defined }}" \ No newline at end of file +elasticsearch_should_auth_with_iam: "{{ atl_elasticsearch_username is not defined and atl_aws_region is defined }}" \ No newline at end of file diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 4086ad9..d978cf6 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -13,7 +13,7 @@ hazelcast.network.aws.tag.value={{ atl_aws_stack_name }} hazelcast.group.name={{ atl_aws_stack_name }} hazelcast.group.password={{ atl_aws_stack_name }} 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 }} {% else %} plugin.search.elasticsearch.username={{ atl_elasticsearch_username }}