From 6f0443864f9d6b8919e26a9df06ae050342fe827 Mon Sep 17 00:00:00 2001
From: bczoma <balazs.czoma@solace.com>
Date: Fri, 16 Jul 2021 15:13:41 -0400
Subject: [PATCH 1/3] Fixed assert master command

---
 .github/workflows/build-test.yml | 2 +-
 scripts/install-solace.sh        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index fecb548..8dece65 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -48,7 +48,7 @@ jobs:
     - name: Copy test artifacts to test S3 bucket
       run: |
         MESSAGEBROKERNODEINSTANCETYPE=t2.medium
-        sed -i "s@SolaceDockerImageParameterValue@${{ secrets.BROKER_DOCKER_IMAGE_REF }}@g" ci/solace-aws-ha-3az-prod-test.json
+        sed -i "s@SolaceDockerImageParameterValue@bczoma/solacetest:latest@g" ci/solace-aws-ha-3az-prod-test.json
         sed -i "s@EventBrokerNodeInstanceTypeParameterValue@${MESSAGEBROKERNODEINSTANCETYPE}@g" ci/solace-aws-ha-3az-prod-test.json
         aws s3 mb s3://${{ env.TEST_S3_BUCKET }} || echo "s3 bucket already existed"
         export BUCKETREGION=`aws s3api get-bucket-location --bucket ${{ env.TEST_S3_BUCKET }} | grep LocationConstraint | awk -F' ' '{print $NF}' | tr -d '"'`
diff --git a/scripts/install-solace.sh b/scripts/install-solace.sh
index 134fb31..4dcedb5 100644
--- a/scripts/install-solace.sh
+++ b/scripts/install-solace.sh
@@ -503,10 +503,10 @@ if [ "${is_primary}" = "true" ]; then
 
   echo "`date` INFO: Initiating config-sync for router"
   /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
-    -q "<rpc><admin><config-sync><assert-master><router/></assert-master></config-sync></admin></rpc>"
+    -q "<rpc semp-version=\"soltr/9_8VMR\"><admin><config-sync><assert-master><router/></assert-master></config-sync></admin></rpc>"
   echo "`date` INFO: Initiating config-sync for default vpn"
   /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
-    -q "<rpc><admin><config-sync><assert-master><vpn-name>default</vpn-name></assert-master></config-sync></admin></rpc>"
+    -q "<rpc semp-version=\"soltr/9_8VMR\"><admin><config-sync><assert-master><vpn-name>default</vpn-name></assert-master></config-sync></admin></rpc>"
 
   # Wait for config-sync results
   count=0
@@ -532,9 +532,9 @@ if [ "${is_primary}" = "true" ]; then
     if (( $count % 18 == 0 )) ; then
       echo "`date` INFO: Re-trying initiate config-sync for router"
       /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
-              -q "<rpc><admin><config-sync><assert-master><router/></assert-master></config-sync></admin></rpc>"
+              -q "<rpc semp-version=\"soltr/9_8VMR\"><admin><config-sync><assert-master><router/></assert-master></config-sync></admin></rpc>"
       /tmp/semp_query.sh -n admin -p ${admin_password} -u http://localhost:8080/SEMP \
-              -q "<rpc><admin><config-sync><assert-master><vpn-name>default</vpn-name></assert-master></config-sync></admin></rpc>"
+              -q "<rpc semp-version=\"soltr/9_8VMR\"><admin><config-sync><assert-master><vpn-name>default</vpn-name></assert-master></config-sync></admin></rpc>"
     fi
 
     sleep ${pause}

From bf712b5aaa8d3007230343467376d3a072f94e5c Mon Sep 17 00:00:00 2001
From: bczoma <balazs.czoma@solace.com>
Date: Thu, 22 Jul 2021 11:23:28 -0400
Subject: [PATCH 2/3] Updated recommended broker version in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1c27c40..b9a42e5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Install and Configure Solace PubSub+ Software Event Broker in an HA Tuple using AWS Cloud Formation
 
-This project is a best practice template intended for development and demo purposes. The tested and recommended Solace PubSub+ Software Event Broker version is 9.8.
+This project is a best practice template intended for development and demo purposes. The tested and recommended Solace PubSub+ Software Event Broker version is 9.10.
 
 This document provides a quick getting started guide to install a Solace PubSub+ software event broker deployment in Amazon Web Services cloud computing platform.
 

From 888643742362a00eeabd09d7b1ab6d39dcb05c49 Mon Sep 17 00:00:00 2001
From: bczoma <balazs.czoma@solace.com>
Date: Thu, 22 Jul 2021 12:05:15 -0400
Subject: [PATCH 3/3] Restored test broker version

---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 8dece65..fecb548 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -48,7 +48,7 @@ jobs:
     - name: Copy test artifacts to test S3 bucket
       run: |
         MESSAGEBROKERNODEINSTANCETYPE=t2.medium
-        sed -i "s@SolaceDockerImageParameterValue@bczoma/solacetest:latest@g" ci/solace-aws-ha-3az-prod-test.json
+        sed -i "s@SolaceDockerImageParameterValue@${{ secrets.BROKER_DOCKER_IMAGE_REF }}@g" ci/solace-aws-ha-3az-prod-test.json
         sed -i "s@EventBrokerNodeInstanceTypeParameterValue@${MESSAGEBROKERNODEINSTANCETYPE}@g" ci/solace-aws-ha-3az-prod-test.json
         aws s3 mb s3://${{ env.TEST_S3_BUCKET }} || echo "s3 bucket already existed"
         export BUCKETREGION=`aws s3api get-bucket-location --bucket ${{ env.TEST_S3_BUCKET }} | grep LocationConstraint | awk -F' ' '{print $NF}' | tr -d '"'`