Skip to content

Commit b3a3049

Browse files
authored
aws2 update
1 parent 2dbff3a commit b3a3049

File tree

1 file changed

+36
-45
lines changed

1 file changed

+36
-45
lines changed

templates/ibm-spectrum-scale.template

Lines changed: 36 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
]
167167
},
168168
"DataReplica": {
169-
"Description": "Number of replica copies of data and metadata across the all cluster nodes on two AZs.",
169+
"Description": "Number of replica copies of data across the all cluster nodes on two AZs.",
170170
"Type": "Number",
171171
"Default": "2",
172172
"AllowedValues": [
@@ -384,7 +384,7 @@
384384
"ConstraintDescription": "Must be a valid email address."
385385
},
386386
"SpectrumS3Bucket": {
387-
"Description": "The name of the S3 bucket to be used for data store and SSH key synchronization between nodes. If you don’t have an existing S3 bucket to reuse, you must create a new S3 bucket before launching this Quick Start.",
387+
"Description": "The name of the S3 bucket to be used for data store and SSH key synchronization between nodes. If you do not have an existing S3 bucket to reuse, you must create a new S3 bucket before launching this Quick Start.",
388388
"AllowedPattern": "^[0-9a-zA-Z]+([0-9a-zA-Z-]*[0-9a-zA-Z])*$",
389389
"Type": "String",
390390
"MinLength": "1",
@@ -415,47 +415,47 @@
415415
},
416416
"Mappings": {
417417
"RegionMap": {
418-
"ap-northeast-1": {
419-
"AMI": "ami-c8ca3fae"
420-
},
421-
"ap-northeast-2": {
422-
"AMI": "ami-c4459caa"
418+
"us-east-1": {
419+
"AMI": "ami-22844c58"
423420
},
424-
"ap-south-1": {
425-
"AMI": "ami-08750f67"
421+
"us-east-2": {
422+
"AMI": "ami-a7765ac2"
426423
},
427-
"ap-southeast-1": {
428-
"AMI": "ami-07eb7064"
424+
"us-west-1": {
425+
"AMI": "ami-ce586aae"
429426
},
430-
"ap-southeast-2": {
431-
"AMI": "ami-6aa6bf09"
427+
"us-west-2": {
428+
"AMI": "ami-a5bf79dd"
432429
},
433430
"ca-central-1": {
434-
"AMI": "ami-5dc97739"
435-
},
436-
"eu-central-1": {
437-
"AMI": "ami-66e74e09"
431+
"AMI": "ami-1bf24a7f"
438432
},
439433
"eu-west-1": {
440-
"AMI": "ami-6299691b"
434+
"AMI": "ami-09c91b70"
435+
},
436+
"eu-central-1": {
437+
"AMI": "ami-32843b5d"
441438
},
442439
"eu-west-2": {
443-
"AMI": "ami-9a9081fe"
440+
"AMI": "ami-79607d1d"
444441
},
445-
"sa-east-1": {
446-
"AMI": "ami-4731402b"
442+
"ap-southeast-1": {
443+
"AMI": "ami-56196235"
447444
},
448-
"us-east-1": {
449-
"AMI": "ami-18b09b63"
445+
"ap-southeast-2": {
446+
"AMI": "ami-5712f035"
450447
},
451-
"us-east-2": {
452-
"AMI": "ami-f4af8f91"
448+
"ap-northeast-2": {
449+
"AMI": "ami-cdff5aa3"
453450
},
454-
"us-west-1": {
455-
"AMI": "ami-d3aa81b3"
451+
"ap-northeast-1": {
452+
"AMI": "ami-943be4f2"
456453
},
457-
"us-west-2": {
458-
"AMI": "ami-c16c8cb9"
454+
"ap-south-1": {
455+
"AMI": "ami-1b296a74"
456+
},
457+
"sa-east-1": {
458+
"AMI": "ami-e6512f8a"
459459
}
460460
}
461461
},
@@ -1347,7 +1347,7 @@
13471347
},
13481348
"\n",
13491349
"echo DataReplica $DataReplica\n",
1350-
"MetadataReplica=$DataReplica\n",
1350+
"MetadataReplica=2\n",
13511351
"\n",
13521352
"echo MetadataReplica $MetadataReplica\n",
13531353
"FsName=fs1\n",
@@ -1507,12 +1507,7 @@
15071507
" chmod 755 /var/log/nsdFile\n",
15081508
" echo Create GPFS NSD..\n",
15091509
" sed -i \"s/FG_${AZ}/1/\" /var/log/nsdFile\n",
1510-
" if [ ${DataReplica} == 2 ]\n",
1511-
" then\n",
1512-
" sed -i \"s/FG_../2/\" /var/log/nsdFile\n",
1513-
" else\n",
1514-
" sed -i \"s/FG_../1/\" /var/log/nsdFile\n",
1515-
" fi\n",
1510+
" sed -i \"s/FG_../2/\" /var/log/nsdFile\n",
15161511
" echo copying updated nsdFile file to admin node...\n",
15171512
" scp /var/log/nsdFile ${adminNode}:/var/log/nsdFile\n",
15181513
" /usr/lpp/mmfs/bin/mmcrnsd -F /var/log/nsdFile\n",
@@ -1628,7 +1623,7 @@
16281623
},
16291624
"\n",
16301625
"echo DataReplica $DataReplica\n",
1631-
"MetadataReplica=$DataReplica",
1626+
"MetadataReplica=2",
16321627
"\n",
16331628
"echo MetadataReplica $MetadataReplica\n",
16341629
"\n",
@@ -1976,9 +1971,7 @@
19761971
{
19771972
"DeviceName": "/dev/sda1",
19781973
"Ebs": {
1979-
"VolumeSize": {
1980-
"Ref": "DiskSize"
1981-
},
1974+
"VolumeSize": "100",
19821975
"VolumeType": "gp2"
19831976
}
19841977
}
@@ -2354,7 +2347,7 @@
23542347
"Ref": "ServerNodeCount"
23552348
},
23562349
"\n",
2357-
"MetadataReplica=$DataReplica\n",
2350+
"MetadataReplica=2\n",
23582351
"echo Generate GPFS cluster node file\n",
23592352
"rm /var/log/nsdFile\n",
23602353
"touch /var/log/nsdFile\n",
@@ -2576,9 +2569,7 @@
25762569
{
25772570
"DeviceName": "/dev/sda1",
25782571
"Ebs": {
2579-
"VolumeSize": {
2580-
"Ref": "DiskSize"
2581-
},
2572+
"VolumeSize": "100",
25822573
"VolumeType": "gp2"
25832574
}
25842575
}
@@ -2719,4 +2710,4 @@
27192710
"Description": "Stack Name"
27202711
}
27212712
}
2722-
}
2713+
}

0 commit comments

Comments
 (0)