Merge in the AMI updates (#53)

* Updated the Cloud Formation templates to use the latest MarkLogic AMI (10.0-8.2).
Minor updates to the CloudFormation QuickStart.
Null-op merges for previous commits because I still don't understand Git.

AWS-CloudFormation/CloudFormation-QuickStart.md

@@ -9,8 +9,8 @@ In particular, IP addresses are in the config files._
 
 ## Requirements
 * You need to have an AWS account
-* You need to have subscribed to the [MarkLogic AMI](https://aws.amazon.com/marketplace/pp/B072Z536VB?ref_=aws-mp-console-subscription-detail)
-* You need to have subscribed to the [Kafka Certified by Bitnami AMI](https://aws.amazon.com/marketplace/pp/B01K0IWPVI?qid=1587125714910&sr=0-1&ref_=srh_res_product_title)
+* You need to have subscribed to the [MarkLogic AMI](https://aws.amazon.com/marketplace/pp/prodview-ukwfvbhifree4)
+* You need to have subscribed to the [Apache Kafka packaged by Bitnami AMI](https://aws.amazon.com/marketplace/pp/prodview-wwaejlwapzhng)
 
 ## Create a Key Pair in AWS
 Please note: if you are using the default values in the resource files, you will need to be in the us-east-1 (Virginia) region when you follow these steps.
@@ -31,7 +31,7 @@ Please note: if you are using the default values in the resource files, you will
 
 ## Build the AWS Resources
 1. Navigate to the [AWS CloudFormation](https://console.aws.amazon.com/cloudformation/home?region=us-east-1) page.
-1. Click "Create Stack" and "With new resources (standard)"
+1. Click "Create Stack"
 1. Click the "Upload a template file" radio button
 1. Click "Upload File" and upload "readyToGo.json"
 1. Click "Next"

AWS-CloudFormation/cloudFormationTemplates/justTheResources.json

@@ -72,7 +72,7 @@
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
         "EbsOptimized": "true",
-        "ImageId": "ami-0879bd2e59cecb73e",
+        "ImageId": "ami-00a5412a2533c3c4f",
         "InstanceType": "c5.large",
         "KeyName": "kafka",
         "Monitoring": "false",
@@ -116,7 +116,7 @@
       "Properties": {
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
-        "ImageId": "ami-0879bd2e59cecb73e",
+        "ImageId": "ami-00a5412a2533c3c4f",
         "InstanceType": "t2.large",
         "KeyName": "kafka",
         "Monitoring": "false",
@@ -162,7 +162,7 @@
       "Properties": {
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
-        "ImageId": "ami-0d77ce6990428613f",
+        "ImageId": "ami-02d4f218b9851a406",
         "InstanceType": "r3.xlarge",
         "KeyName": "kafka",
         "Monitoring": "false",

AWS-CloudFormation/cloudFormationTemplates/readyToGo.json

@@ -71,7 +71,7 @@
       "Properties": {
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
-        "ImageId": "ami-0879bd2e59cecb73e",
+        "ImageId": "ami-00a5412a2533c3c4f",
         "InstanceType": "t2.large",
         "KeyName": "kafka",
         "Monitoring": "false",
@@ -128,7 +128,7 @@
       "Properties": {
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
-        "ImageId": "ami-0879bd2e59cecb73e",
+        "ImageId": "ami-00a5412a2533c3c4f",
         "InstanceType": "t2.large",
         "KeyName": "kafka",
         "Monitoring": "false",
@@ -191,7 +191,7 @@
       "Properties": {
         "DisableApiTermination": "false",
         "InstanceInitiatedShutdownBehavior": "stop",
-        "ImageId": "ami-0d77ce6990428613f",
+        "ImageId": "ami-02d4f218b9851a406",
         "InstanceType": "r3.large",
         "KeyName": "kafka",
         "Monitoring": "false",