From 9704864ee0f930b0a99241808c5204bae0f0a64b Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Thu, 22 Oct 2020 15:33:24 +1100
Subject: [PATCH] DCD-1123: Make clustering optional for BB, and misc. config
 cleanups.

---
 roles/bitbucket_config/default/main.yaml          |  1 -
 roles/bitbucket_config/defaults/main.yaml         |  4 ++++
 .../templates/bitbucket.properties.j2             | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)
 delete mode 100644 roles/bitbucket_config/default/main.yaml
 create mode 100644 roles/bitbucket_config/defaults/main.yaml

diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml
deleted file mode 100644
index ed97d53..0000000
--- a/roles/bitbucket_config/default/main.yaml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml
new file mode 100644
index 0000000..947f10d
--- /dev/null
+++ b/roles/bitbucket_config/defaults/main.yaml
@@ -0,0 +1,4 @@
+---
+
+atl_enable_clustering: true
+atl_external_elasticsearch: true
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 444855f..294a1a9 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -4,6 +4,7 @@ jdbc.url={{ atl_jdbc_url }}
 jdbc.user={{ atl_jdbc_user }}
 jdbc.password={{ atl_jdbc_password }}
 
+{% if atl_enable_clustering %}
 hazelcast.network.aws=true
 hazelcast.network.aws.tag.key=Cluster
 hazelcast.network.multicast=false
@@ -12,15 +13,26 @@ hazelcast.network.aws.region={{ atl_aws_region }}
 hazelcast.network.aws.tag.value={{ atl_aws_stack_name }}
 hazelcast.group.name={{ atl_aws_stack_name }}
 hazelcast.group.password={{ atl_aws_stack_name }}
+{% endif %}
+
+{% if atl_external_elasticsearch %}
 plugin.search.elasticsearch.aws.region={{ atl_aws_region }}
 plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }}
+{% endif %}
+
 setup.displayName=Bitbucket
+{% if atl_bitbucket_baseurl is defined %}
 setup.baseUrl = {{ atl_bitbucket_baseurl }}
+{% endif %}
+{% if atl_bitbucket_license_key is defined %}
 setup.license={{ atl_bitbucket_license_key }}
+{% endif %}
+{% if atl_bitbucket_admin_password is defined %}
 setup.sysadmin.username=admin
 setup.sysadmin.password={{ atl_bitbucket_admin_password }}
-setup.sysadmin.displayName=AdminIstrator
+setup.sysadmin.displayName=Administrator
 setup.sysadmin.emailAddress=admin@yourcompany.com
+{% endif %}
 
 server.proxy-name={{ atl_proxy_name }}
 server.secure={{ atl_ssl_proxy }}
@@ -33,4 +45,3 @@ server.additional-connector.1.port=7991
 server.scheme=http
 server.proxy-port=80
 {% endif %}
-