From 7f3b5f3afade99e40f13061e5a3f17bf97c2b7ae Mon Sep 17 00:00:00 2001 From: bmeehan Date: Thu, 23 Jun 2022 16:49:24 +1000 Subject: [PATCH 1/2] ITPLT-1615 allow bbdc using mesh for repose to put shared_home on EFS --- aws_bitbucket_dc_node.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 52de505..4103944 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -32,7 +32,10 @@ roles: - role: linux_common - role: aws_common - - role: nfs_mount + # for Bitbucket DC clusters that store repos on bb-mesh, + # nodes may be setup to use EFS instead of NFS for shared_home by not defining atl_fileserver_host + - { role: aws_shared_fs_config, when: atl_fileserver_host is not defined } + - { role: nfs_mount, when : (atl_fileserver_host is defined) and (atl_fileserver_host|length > 0) } - role: product_common - role: product_install - role: database_init From 177a99f8010aa3ff3f95b1dfb7a870d279307842 Mon Sep 17 00:00:00 2001 From: bmeehan Date: Wed, 29 Jun 2022 09:27:39 +1000 Subject: [PATCH 2/2] ITPLT-1615 - added dcd suggestions --- aws_bitbucket_dc_node.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 4103944..0e5d297 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -32,9 +32,9 @@ roles: - role: linux_common - role: aws_common - # for Bitbucket DC clusters that store repos on bb-mesh, - # nodes may be setup to use EFS instead of NFS for shared_home by not defining atl_fileserver_host - - { role: aws_shared_fs_config, when: atl_fileserver_host is not defined } + # For Bitbucket DC clusters that store repos on Bitbucket Mesh(https://confluence.atlassian.com/bitbucketserver/bitbucket-data-center-and-server-8-0-release-notes-1115659343.html#BitbucketDataCenterandServer8.0releasenotes-mesh), + # nodes may be setup to use EFS instead of NFS for shared_home by not defining 'atl_fileserver_host' + - { role: aws_shared_fs_config, when: (atl_fileserver_host is not defined) and (atl_efs_id|length > 0) } - { role: nfs_mount, when : (atl_fileserver_host is defined) and (atl_fileserver_host|length > 0) } - role: product_common - role: product_install