Skip to content

Commit fa43c99

Browse files
mydittlemydittle
committed
Updates to template and script
1 parent 7646b2e commit fa43c99

File tree

3 files changed

+39
-71
lines changed

3 files changed

+39
-71
lines changed

‎windows/tsm/SilentInstaller/SilentInstaller.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ def run_inno_installer(options):
244244
inno_installer_args = [
245245
'/VERYSILENT', # No progress GUI, message boxes still possible
246246
'/SUPPRESSMSGBOXES', # No message boxes. Only has an effect when combined with '/SILENT' or '/VERYSILENT'.
247+
'/ACCEPTEULA',
247248
'/LOG=' + inno_log_file_full_path,
248249
'/DIR=' + options.installDir,
249250
'/DATADIR=' + options.dataDir,
@@ -313,6 +314,7 @@ def run_worker_installer(options, secrets):
313314
worker_installer_args = [
314315
'/VERYSILENT', # No progress GUI, message boxes still possible
315316
'/SUPPRESSMSGBOXES', # No message boxes. Only has an effect when combined with '/SILENT' or '/VERYSILENT'.
317+
'/ACCEPTEULA',
316318
'/LOG=' + worker_log_file_full_path,
317319
'/DIR=' + options.installDir,
318320
'/DATADIR=' + options.dataDir,
@@ -413,7 +415,7 @@ def run_setup(options, secrets, package_version):
413415
print('Configuration settings imported')
414416
run_tsm_command(tsm_path, secrets, ['pending-changes', 'apply', '--ignore-prompt', '--ignore-warnings'], port)
415417
print('Configuration applied')
416-
run_tsm_command(tsm_path, secrets, ['initialize', '--request-timeout', '1800'], port)
418+
run_tsm_command(tsm_path, secrets, ['initialize', '--request-timeout', '7200'], port)
417419
print('Initialization completed')
418420
get_nodes_and_apply_topology(options.configFile, tsm_path, secrets, port)
419421
run_tsm_command(tsm_path, secrets, ['pending-changes', 'apply', '--ignore-prompt', '--ignore-warnings'], port)

‎windows/tsm/aws/tableau-cluster-windows-tsm-simple.json

Lines changed: 34 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"AWSTemplateFormatVersion" : "2010-09-09",
33

4-
"Description" : "Tableau Server cluster with three nodes running on Windows, available via Amazon-based hostname",
4+
"Description" : "CloudFormation Template for TSM-based 3-node Tableau Server cluster on Windows",
55

66
"Parameters" : {
77
"KeyName" : {
@@ -18,20 +18,9 @@
1818
"Type" : "String",
1919
"MinLength" : "9",
2020
"MaxLength" : "18",
21-
"Default": "69.25.143.0/24",
2221
"AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
2322
"ConstraintDescription": "Must be a valid IP CIDR range of the form x.x.x.x/x."
2423
},
25-
"EC2CreationUser" : {
26-
"Description" : "Tableau-specific tag used to identify who created this instance; name or identifier of person",
27-
"Type" : "String",
28-
"MinLength" : "1"
29-
},
30-
"EC2Keepalive" : {
31-
"Description" : "Tableau-specific tag used to determine max life length of instance; use MM/DD/YYYY format",
32-
"Type" : "String",
33-
"MinLength" : "1"
34-
},
3524
"Username" : {
3625
"Description" : "Tableau Services Manager (TSM) administrator username (cannot be Administrator)",
3726
"Type": "String",
@@ -118,8 +107,7 @@
118107
"ParameterGroups" : [
119108
{
120109
"Label" : { "default" : "AWS Environment" },
121-
"Parameters" : ["KeyName","ResourceAvailabilityZone","SourceCidr",
122-
"EC2CreationUser", "EC2Keepalive"]
110+
"Parameters" : ["KeyName","ResourceAvailabilityZone","SourceCidr"]
123111
},
124112
{
125113
"Label" : { "default" : "Configure Initial Tableau Admin User" },
@@ -146,12 +134,6 @@
146134
"SourceCidr": {
147135
"default": "Source CIDR for access"
148136
},
149-
"EC2CreationUser": {
150-
"default": "(Tableau Specific) Tableau User"
151-
},
152-
"EC2Keepalive": {
153-
"default": "(Tableau Specific) Resources Keepalive"
154-
},
155137
"Username" : {
156138
"default" : "Tableau Services Manager (TSM) administrator username"
157139
},
@@ -257,8 +239,7 @@
257239
"DefaultConfiguration" : {
258240
"InstallationConfig" : {
259241
"InstallationBucket" : "tableau-quickstart",
260-
"InstallationExecutable" : "Tableau-Server-2018.2-Beta1-x64.exe",
261-
"InstallationWorkerExecutable" : "Tableau-Server-2018.2-Beta1-x64.exe"
242+
"InstallationExecutable" : "Tableau-Server-2018.2-Beta1-x64.exe"
262243
},
263244
"MachineConfiguration" : {
264245
"BastionInstanceType" : "t2.micro",
@@ -481,7 +462,7 @@
481462
"Tags": [
482463
{
483464
"Key" : "Name",
484-
"Value" : {"Fn::Sub" : "${EC2CreationUser}-cfn-lb"}
465+
"Value" : {"Fn::Sub" : "${AWS::StackName}-cfn-lb"}
485466
}
486467
]
487468
}
@@ -543,15 +524,7 @@
543524
"Tags": [
544525
{
545526
"Key" : "Name",
546-
"Value" : {"Fn::Sub" : "${EC2CreationUser}-bastion-host"}
547-
},
548-
{
549-
"Key" : "keepalive",
550-
"Value" : { "Ref" : "EC2Keepalive" }
551-
},
552-
{
553-
"Key" : "user",
554-
"Value" : { "Ref" : "EC2CreationUser" }
527+
"Value" : {"Fn::Sub" : "${AWS::StackName}-bastion-host"}
555528
}
556529
]
557530
}
@@ -606,7 +579,7 @@
606579
{
607580
"Ref": "RegCompany"
608581
},
609-
"AWSQuickStart"
582+
"AWSQuickStart-WinBeta"
610583
]
611584
]
612585
},
@@ -680,7 +653,7 @@
680653
"IF /I %Var% GEQ 3 GOTO FoundIt ",
681654
"call TIMEOUT /T 60 >nul ",
682655
"GOTO CheckForNodes ",
683-
656+
684657
":FoundIt ",
685658
"call tsm.cmd login -u %1 -p %2 ",
686659
"call tsm.cmd topology set-process -n node2 -pr clustercontroller -c 1 ",
@@ -691,7 +664,7 @@
691664
"call tsm.cmd topology set-process -n node2 -pr searchserver -c 1 ",
692665
"call tsm.cmd topology set-process -n node2 -pr backgrounder -c 1 ",
693666
"call tsm.cmd topology set-process -n node2 -pr dataserver -c 1 ",
694-
"call tsm.cmd topology set-process -n node2 -pr filestore -c 1 ",
667+
"call tsm.cmd topology set-process -n node2 -pr filestore -c 1 ",
695668
"call tsm.cmd topology set-process -n node3 -pr clustercontroller -c 1 ",
696669
"call tsm.cmd topology set-process -n node3 -pr gateway -c 1 ",
697670
"call tsm.cmd topology set-process -n node3 -pr vizportal -c 2 ",
@@ -701,7 +674,7 @@
701674
"call tsm.cmd topology set-process -n node3 -pr backgrounder -c 1 ",
702675
"call tsm.cmd topology set-process -n node3 -pr dataserver -c 1 ",
703676
"call tsm.cmd topology set-process -n node3 -pr filestore -c 1 ",
704-
"call tsm.cmd topology set-process -n node2 -pr pgsql -c 1 ",
677+
"call tsm.cmd topology set-process -n node2 -pr pgsql -c 1 ",
705678
"call tsm.cmd pending-changes apply --ignore-warnings --ignore-prompt",
706679
"call tsm.cmd stop ",
707680
"call tsm.cmd topology deploy-coordination-service -n node1,node2,node3 ",
@@ -710,7 +683,7 @@
710683
"call TIMEOUT /T 120 ",
711684
"call tsm.cmd start -u %1 -p %2 ",
712685
"ECHO Completed topology deployment "
713-
]
686+
]
714687
]}
715688
},
716689
"c:\\tabsetup\\python-3.6.4-amd64.exe": {
@@ -858,15 +831,7 @@
858831
"Tags": [
859832
{
860833
"Key" : "Name",
861-
"Value" : {"Fn::Sub" : "${EC2CreationUser}-primary"}
862-
},
863-
{
864-
"Key" : "keepalive",
865-
"Value" : { "Ref" : "EC2Keepalive" }
866-
},
867-
{
868-
"Key" : "user",
869-
"Value" : { "Ref" : "EC2CreationUser" }
834+
"Value" : {"Fn::Sub" : "${AWS::StackName}-primary"}
870835
}
871836
]
872837
}
@@ -1033,7 +998,7 @@
1033998
"M:",
1034999
"\\\\10.0.1.11\\c$\\tabsetup",
10351000
{"Fn::Sub": "${Password}"},
1036-
{"Fn::Sub": "/user:${Username}"}
1001+
{"Fn::Sub": "/user:10.0.1.11\\${Username}"}
10371002
]
10381003
]
10391004
},
@@ -1114,15 +1079,7 @@
11141079
"Tags": [
11151080
{
11161081
"Key" : "Name",
1117-
"Value" : {"Fn::Sub" : "${EC2CreationUser}-worker-1"}
1118-
},
1119-
{
1120-
"Key" : "keepalive",
1121-
"Value" : { "Ref" : "EC2Keepalive" }
1122-
},
1123-
{
1124-
"Key" : "user",
1125-
"Value" : { "Ref" : "EC2CreationUser" }
1082+
"Value" : {"Fn::Sub" : "${AWS::StackName}-worker-1"}
11261083
}
11271084
]
11281085
}
@@ -1289,7 +1246,7 @@
12891246
"M:",
12901247
"\\\\10.0.1.11\\c$",
12911248
{"Fn::Sub": "${Password}"},
1292-
{"Fn::Sub": "/user:${Username}"}
1249+
{"Fn::Sub": "/user:10.0.1.11\\${Username}"}
12931250
]
12941251
]
12951252
},
@@ -1335,7 +1292,7 @@
13351292
"N:",
13361293
"\\\\10.0.1.12\\c$",
13371294
{"Fn::Sub": "${Password}"},
1338-
{"Fn::Sub": "/user:${Username}"}
1295+
{"Fn::Sub": "/user:10.0.1.12\\${Username}"}
13391296
]
13401297
]
13411298
},
@@ -1347,7 +1304,24 @@
13471304
"cwd": "c:\\tabsetup",
13481305
"waitAfterCompletion": "0"
13491306
},
1350-
"7.2-add-hostname3": {
1307+
"7.2-get-share3": {
1308+
"command": {
1309+
"Fn::Join": [
1310+
" ",
1311+
[
1312+
"net",
1313+
"use",
1314+
"O:",
1315+
"\\\\10.0.1.13\\c$",
1316+
{"Fn::Sub": "${Password}"},
1317+
{"Fn::Sub": "/user:10.0.1.13\\${Username}"}
1318+
]
1319+
]
1320+
},
1321+
"cwd": "c:\\tabsetup",
1322+
"waitAfterCompletion": "0"
1323+
},
1324+
"7.3-add-hostname3": {
13511325
"command": "c:\\tabsetup\\AddHostname.cmd 10.0.1.13",
13521326
"cwd": "c:\\tabsetup",
13531327
"waitAfterCompletion": "0"
@@ -1407,15 +1381,7 @@
14071381
"Tags": [
14081382
{
14091383
"Key" : "Name",
1410-
"Value" : {"Fn::Sub" : "${EC2CreationUser}-worker-2"}
1411-
},
1412-
{
1413-
"Key" : "keepalive",
1414-
"Value" : { "Ref" : "EC2Keepalive" }
1415-
},
1416-
{
1417-
"Key" : "user",
1418-
"Value" : { "Ref" : "EC2CreationUser" }
1384+
"Value" : {"Fn::Sub" : "${AWS::StackName}-worker-2"}
14191385
}
14201386
]
14211387
}

‎windows/tsm/aws/tableau-single-server-windows-tsm.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
3-
"Description": "AWS QuickStart Template for Tableau Server running on Windows QS(0040)",
3+
"Description": "CloudFormation Template for TSM-based Tableau Server on Windows",
44
"Parameters": {
55
"InstanceType" : {
66
"Description" : "Amazon EC2 instance type",
@@ -346,7 +346,7 @@
346346
{
347347
"Ref": "RegCompany"
348348
},
349-
"AWSQuickStart"
349+
"AWSQuickStart-WinBeta"
350350
]
351351
]
352352
},

0 commit comments

Comments
 (0)