Skip to content

Commit d17e5e0

Browse files
bczomabczoma
authored
9.4 release (#30)
* Using broker release 9.4 * SecurityEnhancements * Fixing access issue when using data disks * Added TCP for WAN optimization * Connection scaling documentation * Aligned service ports to latest release 9.4 defaults * LB naming fix * Doc updates and test image link
1 parent 28e8e0e commit d17e5e0

9 files changed

+246
-123
lines changed

‎.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ script:
2323
- jsonlint nestedtemplates/*
2424
- UNIQUEID="$(date +%s)"
2525
- TESTRESOURCEGROUPNAME="TravisTestResourceGroup${UNIQUEID}"
26+
- export ADMINPASSWORD=Travispwd1234!
2627
- sed -i "s@ARTIFACTSLOCATION@$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH@g" ci/azuredeploy.parameters.json
2728
- sed -i "s@UNIQUEID@$UNIQUEID@g" ci/azuredeploy.parameters.json
29+
- sed -i "s@solace/solace-pubsub-standard:latest@${SOLACE_DOCKER_URL_PARAMETER_VALUE}@g" ci/azuredeploy.parameters.json
30+
- sed -i "s@ADMINPASSWORD@$ADMINPASSWORD@g" ci/azuredeploy.parameters.json
2831
- az group create --name $TESTRESOURCEGROUPNAME --location "centralus"
2932
- echo "Creating cluster and waiting to become active"
3033
- "travis_wait 30 sleep 1800 &"
@@ -35,9 +38,9 @@ script:
3538
- tar -xvf SDKPERF_C_LINUX64
3639
- pubSubTools/sdkperf_c -cip=$url -mn=100000 -mr=0 -ptl=t1 -stl=t1 | grep "Total Messages"
3740
- sleep 30
38-
- bash -c 'if [[ -z `curl -sS -u admin:Travispwd1234! http://$url:8080/SEMP -d "<rpc><show><config-sync></config-sync></show></rpc>" | grep "<oper-status>Up</oper-status>"` ]] ; then echo "config-sync not up!"; exit 1; fi'
39-
- curl -sS -u admin:Travispwd1234! http://$url:8080/SEMP -d "<rpc><show><redundancy></redundancy></show></rpc>"
40-
- curl -sS -u admin:Travispwd1234! http://$url:8080/SEMP -d "<rpc><show><config-sync></config-sync></show></rpc>"
41+
- bash -c 'if [[ -z `curl -sS -u admin:$ADMINPASSWORD http://$url:8080/SEMP -d "<rpc><show><config-sync></config-sync></show></rpc>" | grep "<oper-status>Up</oper-status>"` ]] ; then echo "config-sync not up!"; exit 1; fi'
42+
- curl -sS -u admin:$ADMINPASSWORD http://$url:8080/SEMP -d "<rpc><show><redundancy></redundancy></show></rpc>"
43+
- curl -sS -u admin:$ADMINPASSWORD http://$url:8080/SEMP -d "<rpc><show><config-sync></config-sync></show></rpc>"
4144

4245

4346
after_success:

‎README.md

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

‎azuredeploy.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"solaceAdminPassword": {
1818
"type": "securestring",
1919
"metadata": {
20-
"description": "Password for the Solace message broker management 'admin' user. For password rules refer to https://docs.solace.com/Configuring-and-Managing/Configuring-Internal-CLI-User-Accounts.htm#Changing-CLI-User-Passwords "
20+
"description": "Password for the PubSub+ event broker management 'admin' user. For password rules refer to https://docs.solace.com/Configuring-and-Managing/Configuring-Internal-CLI-User-Accounts.htm#Changing-CLI-User-Passwords "
2121
}
2222
},
2323
"securityGroupName": {
2424
"type": "string",
2525
"defaultValue": "solace-security",
2626
"metadata": {
27-
"description": "Security group defined to support PubSub+ message broker system level and default message vpn ports."
27+
"description": "Security group defined to support PubSub+ event broker system level and default message vpn ports."
2828
}
2929
},
3030
"workspaceName": {
@@ -132,11 +132,11 @@
132132
"160"
133133
]
134134
},
135-
"solaceMessageBrokerDockerImageReference": {
135+
"solaceEventBrokerDockerImageReference": {
136136
"type": "string",
137137
"defaultValue": "solace/solace-pubsub-standard:latest",
138138
"metadata": {
139-
"description": "Solace PubSub+ message broker docker image reference: a docker registry name with optional tag or a download URL. The download URL can be obtained from http://dev.solace.com/downloads/ or it can be a url to a remotely hosted load version. Default will use the latest image available from Docker Hub."
139+
"description": "Solace PubSub+ event broker docker image reference: a docker registry name with optional tag or a download URL. The download URL can be obtained from http://dev.solace.com/downloads/ or it can be a url to a remotely hosted load version. Default will use the latest image available from Docker Hub."
140140
}
141141
},
142142
"deploymentModel": {
@@ -167,14 +167,14 @@
167167
"type": "string",
168168
"defaultValue": "10.0.0.0/16",
169169
"metadata": {
170-
"description": "The virtual network's address range in CIDR notation where the Solace message broker will be deployed."
170+
"description": "The virtual network's address range in CIDR notation where the PubSub+ event broker will be deployed."
171171
}
172172
},
173173
"subnetPrefix": {
174174
"type": "string",
175175
"defaultValue": "10.0.0.0/24",
176176
"metadata": {
177-
"description": "The subnet's address range in CIDR notation where the Solace message broker will be deployed. It must be contained by the address space of the virtual network. The address range of a subnet which is in use can't be edited."
177+
"description": "The subnet's address range in CIDR notation where the PubSub+ event broker will be deployed. It must be contained by the address space of the virtual network. The address range of a subnet which is in use can't be edited."
178178
}
179179
},
180180
"location": {
@@ -589,7 +589,7 @@
589589
]
590590
},
591591
"protectedSettings": {
592-
"commandToExecute": "[concat('mkdir -p -m 600 ', variables('adminPasswordDir'), '; echo ', parameters('solaceAdminPassword'), ' > ', variables('adminPasswordFile'), '; bash ', variables('solaceInstallScriptName'), ' -c ', copyindex(), ' -d ', parameters('dnsLabelForVmIp'), ' -n ', variables('numberOfInstances'), ' -p ', variables('adminPasswordFile'), ' -s ', if(equals(copyindex(), variables('monitorNodeIndex')), '0', parameters('dataDiskSize')), if(empty(parameters('workspaceName')), '', concat(' -w ', reference(variables('solaceWorkspaceName')).outputs.workspaceId.value)), ' -u ', parameters('solaceMessageBrokerDockerImageReference'))]"
592+
"commandToExecute": "[concat('mkdir -p -m 770 ', variables('adminPasswordDir'), '; echo ', parameters('solaceAdminPassword'), ' > ', variables('adminPasswordFile'), '; bash ', variables('solaceInstallScriptName'), ' -c ', copyindex(), ' -d ', parameters('dnsLabelForVmIp'), ' -n ', variables('numberOfInstances'), ' -p ', variables('adminPasswordFile'), ' -s ', if(equals(copyindex(), variables('monitorNodeIndex')), '0', parameters('dataDiskSize')), if(empty(parameters('workspaceName')), '', concat(' -w ', reference(variables('solaceWorkspaceName')).outputs.workspaceId.value)), ' -u ', parameters('solaceEventBrokerDockerImageReference'))]"
593593
}
594594
}
595595
}

‎azuredeploy.parameters.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"solaceEventBrokerDockerImageReference": {
6+
"value": "solace/solace-pubsub-standard:latest"
7+
},
8+
"dataDiskSize": {
9+
"value": "20"
10+
},
511
"vmAdminUsername": {
612
"value": "GEN-UNIQUE"
713
},
@@ -18,7 +24,7 @@
1824
"value": "GEN-UNIQUE"
1925
},
2026
"deploymentModel": {
21-
"value": "SingleNode"
27+
"value": "HighAvailability"
2228
}
2329
}
2430
}

‎ci/azuredeploy.parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_artifactsLocation": {
66
"value": "https://raw.githubusercontent.com/ARTIFACTSLOCATION/"
77
},
8-
"solaceMessageBrokerDockerImageReference": {
8+
"solaceEventBrokerDockerImageReference": {
99
"value": "solace/solace-pubsub-standard:latest"
1010
},
1111
"vmAdminUsername": {
@@ -15,7 +15,7 @@
1515
"value": "Travispwd1234!"
1616
},
1717
"solaceAdminPassword": {
18-
"value": "Travispwd1234!"
18+
"value": "ADMINPASSWORD"
1919
},
2020
"workspaceName": {
2121
"value": "traviswsUNIQUEID"

‎nestedtemplates/loadbalancer-shared-resources.json

Lines changed: 66 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,25 @@
127127
}
128128
}
129129
},
130+
{
131+
"name": "semptls",
132+
"properties": {
133+
"frontendIPConfiguration": {
134+
"id": "[variables('frontEndIPConfigID')]"
135+
},
136+
"backendAddressPool": {
137+
"id": "[variables('lbPoolID')]"
138+
},
139+
"protocol": "Tcp",
140+
"frontendPort": 1943,
141+
"backendPort": 1943,
142+
"idleTimeoutInMinutes": 5,
143+
"enableFloatingIP": false,
144+
"probe": {
145+
"id": "[variables('lbProbeID')]"
146+
}
147+
}
148+
},
130149
{
131150
"name": "smf",
132151
"properties": {
@@ -166,7 +185,7 @@
166185
}
167186
},
168187
{
169-
"name": "smf-web",
188+
"name": "smftls",
170189
"properties": {
171190
"frontendIPConfiguration": {
172191
"id": "[variables('frontEndIPConfigID')]"
@@ -175,8 +194,8 @@
175194
"id": "[variables('lbPoolID')]"
176195
},
177196
"protocol": "Tcp",
178-
"frontendPort": 80,
179-
"backendPort": 80,
197+
"frontendPort": 55443,
198+
"backendPort": 55443,
180199
"idleTimeoutInMinutes": 5,
181200
"enableFloatingIP": false,
182201
"probe": {
@@ -185,7 +204,7 @@
185204
}
186205
},
187206
{
188-
"name": "mqtt",
207+
"name": "webservices",
189208
"properties": {
190209
"frontendIPConfiguration": {
191210
"id": "[variables('frontEndIPConfigID')]"
@@ -194,8 +213,8 @@
194213
"id": "[variables('lbPoolID')]"
195214
},
196215
"protocol": "Tcp",
197-
"frontendPort": 1883,
198-
"backendPort": 1883,
216+
"frontendPort": 8008,
217+
"backendPort": 8008,
199218
"idleTimeoutInMinutes": 5,
200219
"enableFloatingIP": false,
201220
"probe": {
@@ -204,7 +223,7 @@
204223
}
205224
},
206225
{
207-
"name": "mqtt-web",
226+
"name": "webtls",
208227
"properties": {
209228
"frontendIPConfiguration": {
210229
"id": "[variables('frontEndIPConfigID')]"
@@ -213,8 +232,8 @@
213232
"id": "[variables('lbPoolID')]"
214233
},
215234
"protocol": "Tcp",
216-
"frontendPort": 8000,
217-
"backendPort": 8000,
235+
"frontendPort": 1443,
236+
"backendPort": 1443,
218237
"idleTimeoutInMinutes": 5,
219238
"enableFloatingIP": false,
220239
"probe": {
@@ -241,6 +260,44 @@
241260
}
242261
}
243262
},
263+
{
264+
"name": "mqtt",
265+
"properties": {
266+
"frontendIPConfiguration": {
267+
"id": "[variables('frontEndIPConfigID')]"
268+
},
269+
"backendAddressPool": {
270+
"id": "[variables('lbPoolID')]"
271+
},
272+
"protocol": "Tcp",
273+
"frontendPort": 1883,
274+
"backendPort": 1883,
275+
"idleTimeoutInMinutes": 5,
276+
"enableFloatingIP": false,
277+
"probe": {
278+
"id": "[variables('lbProbeID')]"
279+
}
280+
}
281+
},
282+
{
283+
"name": "mqttweb",
284+
"properties": {
285+
"frontendIPConfiguration": {
286+
"id": "[variables('frontEndIPConfigID')]"
287+
},
288+
"backendAddressPool": {
289+
"id": "[variables('lbPoolID')]"
290+
},
291+
"protocol": "Tcp",
292+
"frontendPort": 8000,
293+
"backendPort": 8000,
294+
"idleTimeoutInMinutes": 5,
295+
"enableFloatingIP": false,
296+
"probe": {
297+
"id": "[variables('lbProbeID')]"
298+
}
299+
}
300+
},
244301
{
245302
"name": "rest",
246303
"properties": {

‎nestedtemplates/security-shared-resources.json

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,87 +112,126 @@
112112
}
113113
},
114114
{
115-
"name": "smf",
115+
"name": "semptls",
116116
"properties": {
117117
"priority": 203,
118118
"sourceAddressPrefix": "*",
119119
"protocol": "Tcp",
120-
"destinationPortRange": "55555",
120+
"destinationPortRange": "1943",
121121
"access": "Allow",
122122
"direction": "Inbound",
123123
"sourcePortRange": "*",
124124
"destinationAddressPrefix": "*"
125125
}
126126
},
127127
{
128-
"name": "smf_compressed",
128+
"name": "smf",
129129
"properties": {
130130
"priority": 204,
131131
"sourceAddressPrefix": "*",
132132
"protocol": "Tcp",
133-
"destinationPortRange": "55003",
133+
"destinationPortRange": "55555",
134134
"access": "Allow",
135135
"direction": "Inbound",
136136
"sourcePortRange": "*",
137137
"destinationAddressPrefix": "*"
138138
}
139139
},
140140
{
141-
"name": "smf_web",
141+
"name": "smf-compressed",
142142
"properties": {
143143
"priority": 205,
144144
"sourceAddressPrefix": "*",
145145
"protocol": "Tcp",
146-
"destinationPortRange": "80",
146+
"destinationPortRange": "55003",
147147
"access": "Allow",
148148
"direction": "Inbound",
149149
"sourcePortRange": "*",
150150
"destinationAddressPrefix": "*"
151151
}
152152
},
153153
{
154-
"name": "mqtt",
154+
"name": "smftls",
155155
"properties": {
156156
"priority": 206,
157157
"sourceAddressPrefix": "*",
158158
"protocol": "Tcp",
159-
"destinationPortRange": "1883",
159+
"destinationPortRange": "55443",
160160
"access": "Allow",
161161
"direction": "Inbound",
162162
"sourcePortRange": "*",
163163
"destinationAddressPrefix": "*"
164164
}
165165
},
166166
{
167-
"name": "mqtt_web",
167+
"name": "webservices",
168168
"properties": {
169169
"priority": 207,
170170
"sourceAddressPrefix": "*",
171171
"protocol": "Tcp",
172-
"destinationPortRange": "8000",
172+
"destinationPortRange": "8008",
173173
"access": "Allow",
174174
"direction": "Inbound",
175175
"sourcePortRange": "*",
176176
"destinationAddressPrefix": "*"
177177
}
178178
},
179179
{
180-
"name": "amqp",
180+
"name": "webtls",
181181
"properties": {
182182
"priority": 208,
183183
"sourceAddressPrefix": "*",
184184
"protocol": "Tcp",
185+
"destinationPortRange": "1443",
186+
"access": "Allow",
187+
"direction": "Inbound",
188+
"sourcePortRange": "*",
189+
"destinationAddressPrefix": "*"
190+
}
191+
},
192+
{
193+
"name": "amqp",
194+
"properties": {
195+
"priority": 209,
196+
"sourceAddressPrefix": "*",
197+
"protocol": "Tcp",
185198
"destinationPortRange": "5672",
186199
"access": "Allow",
187200
"direction": "Inbound",
188201
"sourcePortRange": "*",
189202
"destinationAddressPrefix": "*"
190203
}
191204
},
205+
{
206+
"name": "mqtt",
207+
"properties": {
208+
"priority": 210,
209+
"sourceAddressPrefix": "*",
210+
"protocol": "Tcp",
211+
"destinationPortRange": "1883",
212+
"access": "Allow",
213+
"direction": "Inbound",
214+
"sourcePortRange": "*",
215+
"destinationAddressPrefix": "*"
216+
}
217+
},
218+
{
219+
"name": "mqttweb",
220+
"properties": {
221+
"priority": 211,
222+
"sourceAddressPrefix": "*",
223+
"protocol": "Tcp",
224+
"destinationPortRange": "8000",
225+
"access": "Allow",
226+
"direction": "Inbound",
227+
"sourcePortRange": "*",
228+
"destinationAddressPrefix": "*"
229+
}
230+
},
192231
{
193232
"name": "rest",
194233
"properties": {
195-
"priority": 209,
234+
"priority": 212,
196235
"sourceAddressPrefix": "*",
197236
"protocol": "Tcp",
198237
"destinationPortRange": "9000",

0 commit comments

Comments
 (0)