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

Merge remote-tracking branch 'origin/master' into ITSD-94667-alternative-servicedesk-obr

Browse Source
This commit is contained in:
Geoff Jacobs
2022-07-08 08:44:01 +10:00
parent 8b6a18fdbd 8f7a8eb1ae
commit 7b5c84a2ea
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
aws_bitbucket_dc_node.yml
View File

@@ -32,7 +32,10 @@
roles: roles:
- role: linux_common - role: linux_common
- role: aws_common - role: aws_common
- role: nfs_mount # 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_common
- role: product_install - role: product_install
- role: database_init - role: database_init

1
pipeline_generator/pipeline.py
View File

@@ -16,6 +16,7 @@ def find_all_scenarios():
def load_template(): def load_template():
jenv = j2.Environment( jenv = j2.Environment(
loader=j2.FileSystemLoader('.'), loader=j2.FileSystemLoader('.'),
autoescape=True,
lstrip_blocks=True, lstrip_blocks=True,
trim_blocks=True) trim_blocks=True)
return jenv.get_template(PIPELINE_TEMPLATE_J2_FILE) return jenv.get_template(PIPELINE_TEMPLATE_J2_FILE)