Sync with AWS-hosted quickstart (#45)

* Converted templates to YAML, sync'd with AWS hosted version of this quickstart

* Adjusted Testing parameters

* Fix for commands log showing invalid requests

* Adjusted scaling tier memory limits to latest requirements

README.md

@@ -118,6 +118,7 @@ The next screen will allow you to fill in the details for the selected launch op
 | Instance Type (MonitorNodeInstanceType) | t2.micro | The EC2 instance type for the PubSub+ event broker monitor instance in Availability Zone 3 (or Availability Zone 2, if you’re using only two zones). |
 | **AWS Quick Start Configuration** | |                                                                     |
 | Quick Start S3 Bucket Name (QSS3BucketName) | solace-products | S3 bucket where the Quick Start templates and scripts are installed. Change this parameter to specify the S3 bucket name you’ve created for your copy of Quick Start assets, if you decide to customize or extend the Quick Start for your own use. |
+| Quick Start S3 bucket region (QSS3BucketRegion) | us-east-1 | The AWS Region where the Quick Start S3 bucket (QSS3BucketName) is hosted. When using your own bucket, you must specify this value. |
 | Quick Start S3 Key Prefix (QSS3KeyPrefix) | pubsubplus-aws-ha-quickstart/latest/ | Specifies the S3 folder for your copy of Quick Start assets. Change this parameter if you decide to customize or extend the Quick Start for your own use. |
 
 ### Launch option 2: Parameters for deploying into an existing VPC

ci/solace-aws-ha-3az-prod-travistest.json

@@ -55,6 +55,10 @@
         "ParameterKey": "QSS3BucketName",
         "ParameterValue": "solace-cf-quickstart-travistest"
     },
+    {
+        "ParameterKey": "QSS3BucketRegion",
+        "ParameterValue": "SolaceStackRegionNAME"
+    },
     {
         "ParameterKey": "QSS3KeyPrefix",
         "ParameterValue": "solace/eventbroker/latest/"

scripts/install-solace.sh

@@ -146,32 +146,32 @@ echo "`date` INFO: Solace message broker image and tag: `docker images | grep so
 # Decide which scaling tier applies based on system memory
 # and set maxconnectioncount, ulimit, devshm and swap accordingly
 MEM_SIZE=`cat /proc/meminfo | grep MemTotal | tr -dc '0-9'`
-if [ ${MEM_SIZE} -lt 4000000 ]; then
-  # 100 if mem<4GiB
+if [ ${MEM_SIZE} -lt 6600000 ]; then
+  # 100 if mem<6,325MiB
   maxconnectioncount="100"
   shmsize="1g"
   ulimit_nofile="2448:6592"
   SWAP_SIZE="1024"
-elif [ ${MEM_SIZE} -lt 12000000 ]; then
-  # 1000 if 4GiB<=mem<12GiB
+elif [ ${MEM_SIZE} -lt 14500000 ]; then
+  # 1000 if 6,325MiB<=mem<13,916MiB
   maxconnectioncount="1000"
   shmsize="2g"
   ulimit_nofile="2448:10192"
   SWAP_SIZE="2048"
-elif [ ${MEM_SIZE} -lt 29000000 ]; then
-  # 10000 if 12GiB<=mem<28GiB
+elif [ ${MEM_SIZE} -lt 30600000 ]; then
+  # 10000 if 13,916MiB<=mem<29,215MiB
   maxconnectioncount="10000"
   shmsize="2g"
   ulimit_nofile="2448:42192"
   SWAP_SIZE="2048"
-elif [ ${MEM_SIZE} -lt 58000000 ]; then
-  # 100000 if 28GiB<=mem<56GiB
+elif [ ${MEM_SIZE} -lt 57500000 ]; then
+  # 100000 if 29,215MiB<=mem<54,840MiB
   maxconnectioncount="100000"
   shmsize="3380m"
   ulimit_nofile="2448:222192"
   SWAP_SIZE="2048"
 else
-  # 200000 if 56GiB<=mem
+  # 200000 if 54,840MiB<=mem
   maxconnectioncount="200000"
   shmsize="3380m"
   ulimit_nofile="2448:422192"

scripts/semp_query.sh

@@ -40,7 +40,7 @@ if [[ ${url} = "" || ${name} = "" || ${password} = "" || ${query} = "" ]]; then
   echo  "{\"errorInfo\":\"missing parameter\"}"
   exit 1
 fi
-if [ `curl --write-out '%{http_code}' --silent --output /dev/null -u ${name}:${password} ${url}` != "200" ] ; then
+if [ `curl --write-out '%{http_code}' --silent --output /dev/null -u ${name}:${password} ${url} -d "<rpc><show><version/></show></rpc>` != "200" ] ; then
   echo  "{\"errorInfo\":\"management host is not responding\"}"
   exit 1
 fi