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

DCD-1123: Make clustering optional for BB, and misc. config cleanups.

Browse Source
This commit is contained in:
Steve Smith
2020-10-22 15:33:24 +11:00
parent 02ca566634
commit 9704864ee0
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/bitbucket_config/default/main.yaml
View File

@@ -1 +0,0 @@
---

4
roles/bitbucket_config/defaults/main.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
atl_enable_clustering: true
atl_external_elasticsearch: true

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

@@ -4,6 +4,7 @@ jdbc.url={{ atl_jdbc_url }}
jdbc.user={{ atl_jdbc_user }} jdbc.user={{ atl_jdbc_user }}
jdbc.password={{ atl_jdbc_password }} jdbc.password={{ atl_jdbc_password }}
{% if atl_enable_clustering %}
hazelcast.network.aws=true hazelcast.network.aws=true
hazelcast.network.aws.tag.key=Cluster hazelcast.network.aws.tag.key=Cluster
hazelcast.network.multicast=false 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.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 }}
{% endif %}
{% if atl_external_elasticsearch %}
plugin.search.elasticsearch.aws.region={{ atl_aws_region }} plugin.search.elasticsearch.aws.region={{ atl_aws_region }}
plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }} plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }}
{% endif %}
setup.displayName=Bitbucket setup.displayName=Bitbucket
{% if atl_bitbucket_baseurl is defined %}
setup.baseUrl = {{ atl_bitbucket_baseurl }} setup.baseUrl = {{ atl_bitbucket_baseurl }}
{% endif %}
{% if atl_bitbucket_license_key is defined %}
setup.license={{ atl_bitbucket_license_key }} setup.license={{ atl_bitbucket_license_key }}
{% endif %}
{% if atl_bitbucket_admin_password is defined %}
setup.sysadmin.username=admin setup.sysadmin.username=admin
setup.sysadmin.password={{ atl_bitbucket_admin_password }} setup.sysadmin.password={{ atl_bitbucket_admin_password }}
setup.sysadmin.displayName=AdminIstrator setup.sysadmin.displayName=Administrator
setup.sysadmin.emailAddress=admin@yourcompany.com setup.sysadmin.emailAddress=admin@yourcompany.com
{% endif %}
server.proxy-name={{ atl_proxy_name }} server.proxy-name={{ atl_proxy_name }}
server.secure={{ atl_ssl_proxy }} server.secure={{ atl_ssl_proxy }}
@@ -33,4 +45,3 @@ server.additional-connector.1.port=7991
server.scheme=http server.scheme=http
server.proxy-port=80 server.proxy-port=80
{% endif %} {% endif %}