Merge pull request #56 from SolaceDev/AssertFix

Assert fix

Author: RagnarPaulson

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.
 

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}