Merge pull request #90 from atlassian/develop

Dec/Jan updates to Bitbucket Quickstart
aws-quickstart · Jan 13, 2021 · 4c94893 · 4c94893
2 parents 9f4bad9 + 7632f0c
commit 4c94893
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 20 deletions.
diff --git a/ci/params/3nodes/quickstart-bitbucket-3nodes.json b/ci/params/3nodes/quickstart-bitbucket-3nodes.json
@@ -54,5 +54,9 @@
   {
     "ParameterKey": "ClusterNodeMax",
     "ParameterValue": "3"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/aurora/quickstart-bitbucket-dc-aurora-params.json b/ci/params/aurora/quickstart-bitbucket-dc-aurora-params.json
@@ -42,5 +42,9 @@
   {
       "ParameterKey": "ClusterNodeInstanceType",
       "ParameterValue": "t3.medium"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/automated-setup/quickstart-bitbucket-automated-setup.json b/ci/params/automated-setup/quickstart-bitbucket-automated-setup.json
@@ -54,5 +54,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/dbVersions/quickstart-bitbucket-aurora-10.json b/ci/params/dbVersions/quickstart-bitbucket-aurora-10.json
@@ -50,5 +50,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/dbVersions/quickstart-bitbucket-aurora-11.json b/ci/params/dbVersions/quickstart-bitbucket-aurora-11.json
@@ -50,5 +50,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/dbVersions/quickstart-bitbucket-postgres-10.json b/ci/params/dbVersions/quickstart-bitbucket-postgres-10.json
@@ -50,5 +50,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/dbVersions/quickstart-bitbucket-postgres-11.json b/ci/params/dbVersions/quickstart-bitbucket-postgres-11.json
@@ -50,5 +50,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/dbVersions/quickstart-bitbucket-postgres-12.json b/ci/params/dbVersions/quickstart-bitbucket-postgres-12.json
@@ -50,5 +50,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/default/quickstart-bitbucket-default.json b/ci/params/default/quickstart-bitbucket-default.json
@@ -42,5 +42,9 @@
   {
     "ParameterKey": "QSS3KeyPrefix",
     "ParameterValue": "quickstart-atlassian-bitbucket/"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/jvm-support-opts/quickstart-bitbucket-jvm-support-opts.json b/ci/params/jvm-support-opts/quickstart-bitbucket-jvm-support-opts.json
@@ -46,5 +46,9 @@
   {
     "ParameterKey": "JvmSupportOpts",
     "ParameterValue": "-Dhttp.proxyHost=10.15.112.40 -Dhttp.proxyPort=3128 -Dhttps.proxyHost=10.15.112.40 -Dhttps.proxyPort=3128 -Dhttp.nonProxyHosts=localhost|169.254.169.254"
+  },
+  {
+    "ParameterKey": "BastionHostRequired",
+    "ParameterValue": "false"
   }
 ]
diff --git a/ci/params/ssl-and-dns/quickstart-bitbucket-ci-params.json b/ci/params/ssl-and-dns/quickstart-bitbucket-ci-params.json
@@ -58,5 +58,9 @@
     {
         "ParameterKey": "QSS3KeyPrefix",
         "ParameterValue": "quickstart-atlassian-bitbucket/"
+    },
+    {
+        "ParameterKey": "BastionHostRequired",
+        "ParameterValue": "false"
     }
 ]
diff --git a/ci/quickstart-bitbucket-master.json b/ci/quickstart-bitbucket-master.json
@@ -50,5 +50,9 @@
     {
         "ParameterKey": "ExportPrefix",
         "ParameterValue": "$[taskcat_random-string]"
+    },
+    {
+        "ParameterKey": "BastionHostRequired",
+        "ParameterValue": "false"
     }
 ]
diff --git a/templates/quickstart-bitbucket-dc.template.yaml b/templates/quickstart-bitbucket-dc.template.yaml
@@ -617,24 +617,6 @@ Conditions:
     !Not [!Equals [!Ref KeyPairName, '']]
   IsHomeProvisionedIops:
     !Equals [!Ref HomeVolumeType, Provisioned IOPS]
-  IsVersion5X:
-    !Equals ['5', !Select [0, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX0:
-    !Equals ['0', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX1:
-    !Equals ['1', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX2:
-    !Equals ['2', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX3:
-    !Equals ['3', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX4:
-    !Equals ['4', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX5:
-    !Equals ['5', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  IsVersionX6:
-    !Equals ['6', !Select [1, !Split ['.', !Ref BitbucketVersion]]]
-  ShouldUseES23:
-    !And [Condition: IsVersion5X, !Or [Condition: IsVersionX0, Condition: IsVersionX1, Condition: IsVersionX2, Condition: IsVersionX3, Condition: IsVersionX4, Condition: IsVersionX5, Condition: IsVersionX6]]
   RestoreRDSOrStandby:
     !Or [Condition: RestoreFromRDSSnapshot, Condition: StandbyMode]
   CreateESBucket:
@@ -853,7 +835,7 @@ Resources:
                   - ""
                   - !Sub ["ATL_PRODUCT_VERSION=${BitbucketVersion}", BitbucketVersion: !Ref BitbucketVersion]
                   - !If  [IsBBAdminPasswordProvided, !Sub ["ATL_BB_ADMIN_PASSWORD=${BBAdminPassword}", BBAdminPassword: !Ref BitbucketAdminPassword], !Ref "AWS::NoValue"]
-                  - !If  [IsLicenseKeyProvided, !Sub ["ATL_BB_LICENSEKEY=${LicenseKey}", LicenseKey: !Ref BitbucketLicenseKey], !Ref "AWS::NoValue"]
+                  - !If  [IsLicenseKeyProvided, !Sub ["ATL_BB_LICENSEKEY='${LicenseKey}'", LicenseKey: !Ref BitbucketLicenseKey], !Ref "AWS::NoValue"]
                   - !If  [IsURLProvided, !Sub ["ATL_DATASET_URL=${DatasetURL}", DatasetURL: !Ref BitbucketDatasetURL], !Ref "AWS::NoValue"]
                   - !Sub ["ATL_BB_BASEURL=${BaseURL}", BaseURL: !If [UseCustomDnsName, !Sub ["${HTTP}://${CustomDNSName}", { HTTP: !If [DoSSL, https, http], CustomDNSName: !Ref CustomDnsName }], !Sub ["${HTTP}://${LoadBalancerDNSName}", { HTTP: !If [DoSSL, https, http], LoadBalancerDNSName: !GetAtt LoadBalancer.DNSName }]]]
                   - !Sub ["ATL_PROXY_NAME=${AtlProxyName}", AtlProxyName: !If [UseCustomDnsName, !Ref CustomDnsName, !GetAtt LoadBalancer.DNSName]]
@@ -1034,7 +1016,7 @@ Resources:
         EBSEnabled: true
         VolumeSize: !Ref ElasticsearchNodeVolumeSize
         VolumeType: gp2
-      ElasticsearchVersion: !If [ShouldUseES23, "2.3", "5.5"]
+      ElasticsearchVersion: "6.8"
       ElasticsearchClusterConfig:
         InstanceType: !Ref ElasticsearchInstanceType
       AccessPolicies: