Merge branch 'develop' into DCD-1115-docs_asciidoc_migration

aws-quickstart · Sep 25, 2020 · cdc1b15 · cdc1b15
2 parents 4866c0f + df38f4c
commit cdc1b15
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,4 +4,4 @@
 	branch = main
 [submodule "docs/boilerplate"]
 	path = docs/boilerplate
-	url = git@github.com:aws-quickstart/quickstart-documentation-base-common
+	url = git@github.com:aws-quickstart/quickstart-documentation-base-common
diff --git a/submodules/quickstart-atlassian-services b/submodules/quickstart-atlassian-services
diff --git a/templates/quickstart-bitbucket-dc.template.yaml b/templates/quickstart-bitbucket-dc.template.yaml
@@ -313,7 +313,7 @@ Parameters:
     Type: Number
   ClusterNodeVolumeSize:
     Default: 50
-    Description: Size of cluster node root volume in Gb
+    Description: Size of Bitbucket web server cluster node volume in Gb
     Type: Number
   CreateBucket:
     Default: "true"
@@ -956,6 +956,10 @@ Resources:
 
     Properties:
       AssociatePublicIpAddress: false
+      BlockDeviceMappings:
+        - DeviceName: /dev/xvda
+          Ebs:
+            VolumeSize: !Ref ClusterNodeVolumeSize
       KeyName: !If
         - KeyProvided
         - !Ref KeyPairName
@@ -1170,9 +1174,6 @@ Resources:
 
     Properties:
       BlockDeviceMappings:
-        - DeviceName: /dev/xvda
-          Ebs:
-            VolumeSize: !Ref ClusterNodeVolumeSize
         - DeviceName: /dev/xvdf
           Ebs:
             DeleteOnTermination: !Ref HomeDeleteOnTermination