Skip to content

Commit 089cbd5

Browse files
vsnycvsnyc
authored
Merge pull request #8 from SpectrumScaleOnAWS/master
Description comments change and scale fix
2 parents 706dfde + 531700f commit 089cbd5

File tree

2 files changed

+207
-114
lines changed

2 files changed

+207
-114
lines changed

‎templates/ibm-spectrum-scale-master.template‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
3-
"Description": "This template deploys the AWS IBM Spectrum Scale Quick Start. ***NOTE*** You must subscribe to the SpectrumScale AMI from the AWS Marketplace before you launch this template. See the deployment guide at http://aws.amazon.com/quickstart for details. This template creates Amazon EC2 instances and related resources. You will be billed for the AWS resources used if you create a stack from this template. (qs-1nkhqu6io)",
3+
"Description": "This template deploys the AWS IBM Spectrum Scale Quick Start. See the deployment guide at http://aws.amazon.com/quickstart for details. This template creates Amazon EC2 instances and related resources. You will be billed for the AWS resources used if you create a stack from this template. (qs-1nkhqu6io)",
44
"Metadata": {
55
"AWS::CloudFormation::Interface": {
66
"ParameterGroups": [
77
{
88
"Label": {
9-
"default": "File System Configurations :"
9+
"default": "File System Configurations:"
1010
},
1111
"Parameters": [
1212
"BlockSize",
@@ -44,7 +44,7 @@
4444
},
4545
{
4646
"Label": {
47-
"default": "Network Configuration"
47+
"default": "Network Configuration:"
4848
},
4949
"Parameters": [
5050
"AvailabilityZones",
@@ -58,7 +58,7 @@
5858
},
5959
{
6060
"Label": {
61-
"default": "Amazon EC2 Configuration"
61+
"default": "Amazon EC2 Configuration:"
6262
},
6363
"Parameters": [
6464
"KeyPairName",
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"Label": {
71-
"default": "AWS Quick Start Configuration"
71+
"default": "AWS Quick Start Configuration:"
7272
},
7373
"Parameters": [
7474
"QSS3BucketName",
@@ -77,7 +77,7 @@
7777
},
7878
{
7979
"Label": {
80-
"default": "Personal Configuration"
80+
"default": "Personal Configuration:"
8181
},
8282
"Parameters": [
8383
"SpectrumS3Bucket",
@@ -95,7 +95,7 @@
9595
],
9696
"ParameterLabels": {
9797
"BlockSize": {
98-
"default": "BlockSize"
98+
"default": "Block Size"
9999
},
100100
"DataReplica": {
101101
"default": "Data replica"
@@ -155,7 +155,7 @@
155155
"default": "Allowed External Access CIDR"
156156
},
157157
"KeyPairName": {
158-
"default": "Key Name"
158+
"default": "Key Pair Name"
159159
},
160160
"BastionInstanceType": {
161161
"default": "Bastion Instance Type"
@@ -177,7 +177,7 @@
177177
"AllowedValues": [
178178
"Accept"
179179
],
180-
"Description": "LICENSE INFORMATION: Details License Information can be found in: https://s3-us-west-2.amazonaws.com/spectrumscale-web/License/license.html ",
180+
"Description": "LICENSE INFORMATION: Details License Information can be found in: http://spectrumscale-license.s3-website-us-west-2.amazonaws.com. ",
181181
"Type": "String"
182182
},
183183
"QSS3BucketName": {
@@ -195,14 +195,14 @@
195195
"Type": "String"
196196
},
197197
"SpectrumS3Bucket": {
198-
"Description": "Important: Enter name of a personally owned/created S3 bucket to be used for data store and SSH key synchronization between nodes. If there is no pre-existing S3 bucket to re-use, create a new S3 bucket before launching this quick start",
198+
"Description": "Important: Enter name of a personally owned/created S3 bucket to be used for data store and SSH key synchronization between nodes. If there is no pre-existing S3 bucket to re-use, create a new S3 bucket before launching this quick start.",
199199
"AllowedPattern": "^[0-9a-zA-Z]+([0-9a-zA-Z-]*[0-9a-zA-Z])*$",
200200
"Type": "String",
201201
"MinLength": "1",
202202
"ConstraintDescription": "Must own the specified bucket."
203203
},
204204
"BlockSize": {
205-
"Description": "File system block size",
205+
"Description": "File system block size.",
206206
"Type": "String",
207207
"Default": "1M",
208208
"AllowedValues": [
@@ -216,7 +216,7 @@
216216
]
217217
},
218218
"DataReplica": {
219-
"Description": "Number of replica copies of data and metadata across the all cluster nodes on two AZs",
219+
"Description": "Number of replica copies of data and metadata across the all cluster nodes on two AZs.",
220220
"Type": "Number",
221221
"Default": "2",
222222
"AllowedValues": [
@@ -228,10 +228,10 @@
228228
"Type": "String",
229229
"Default": "/gpfs/fs1",
230230
"AllowedPattern": "(/[a-zA-Z0-9]+)/([a-zA-Z0-9]+)",
231-
"Description": "The mount point for the Spectrum Scale volume i.e /gpfs/fs1"
231+
"Description": "The mount point for the Spectrum Scale volume i.e /gpfs/fs1."
232232
},
233233
"EBSType": {
234-
"Description": "EBS Volume Type. Allowed options are: gp2, io1, standard",
234+
"Description": "EBS Volume Type. Allowed options are: gp2, io1, standard.",
235235
"Type": "String",
236236
"Default": "gp2",
237237
"AllowedValues": [
@@ -241,7 +241,7 @@
241241
]
242242
},
243243
"DiskPerNode": {
244-
"Description": "This number of disks would be attached to only with nsd server nodes",
244+
"Description": "Number of disks attached to each Server Node.",
245245
"Type": "Number",
246246
"Default": "1",
247247
"AllowedValues": [
@@ -263,15 +263,15 @@
263263
]
264264
},
265265
"DiskSize": {
266-
"Description": "Supported disk size are MIN=5 and MAX=10240 (GB)",
266+
"Description": "Supported disk size are MIN=10 and MAX=16384 (GB).",
267267
"Type": "Number",
268-
"Default": "5",
269-
"MinValue": "5",
270-
"MaxValue": "10240",
271-
"ConstraintDescription": "Alloed Disk size are MIN=5,MAX=10240 (GB)"
268+
"Default": "100",
269+
"MinValue": "10",
270+
"MaxValue": "16384",
271+
"ConstraintDescription": "Allowed Disk size are MIN=10,MAX=16384 (GB)."
272272
},
273273
"ServerNodeCount": {
274-
"Description": "Number of EC2 instances to launch for NSD Server on GPFS cluster (MIN=2, Max=64)",
274+
"Description": "Number of EC2 instances to launch for NSD Server on GPFS cluster (MIN=2, MAX=64).",
275275
"Type": "Number",
276276
"Default": "2",
277277
"AllowedValues": [
@@ -308,10 +308,10 @@
308308
"62",
309309
"64"
310310
],
311-
"ConstraintDescription": "NSD Server node size must be between 2 to 64"
311+
"ConstraintDescription": "NSD Server node size must be between 2 to 64."
312312
},
313313
"ServerInstanceType": {
314-
"Description": "Instance type to use for the NSD Server nodes instances",
314+
"Description": "Instance type to use for the NSD Server nodes instances.",
315315
"Type": "String",
316316
"Default": "t2.micro",
317317
"AllowedValues": [
@@ -352,15 +352,15 @@
352352
"ConstraintDescription": "must be a valid EC2 instance type."
353353
},
354354
"ComputeNodeCount": {
355-
"Description": "Number of Compute node instances (MIN=1, MAX=64)",
355+
"Description": "Number of Compute node instances (MIN=1, MAX=64).",
356356
"Type": "Number",
357357
"Default": "2",
358358
"MinValue": "1",
359359
"MaxValue": "64",
360-
"ConstraintDescription": "Compute node size must be between 1 to 64"
360+
"ConstraintDescription": "Compute node size must be between 1 to 64."
361361
},
362362
"ComputeInstanceType": {
363-
"Description": "Instance type to use for the Compute node instances",
363+
"Description": "Instance type to use for the Compute node instances.",
364364
"Type": "String",
365365
"Default": "t2.micro",
366366
"AllowedValues": [
@@ -404,42 +404,42 @@
404404
"Description": "List of Availability Zones to use for the subnets in the VPC. Only two Availability Zones are used for this deployment, and the logical order of your selections is preserved.",
405405
"Type": "List<AWS::EC2::AvailabilityZone::Name>",
406406
"AllowedPattern": "(([a-zA-Z]+)-([a-zA-Z]+)-([0-9a-z]+))",
407-
"ConstraintDescription": "Two Availability Zone must be added"
407+
"ConstraintDescription": "Two Availability Zone must be added."
408408
},
409409
"VPCCIDR": {
410-
"Description": "CIDR Block for the VPC",
410+
"Description": "CIDR Block for the VPC.",
411411
"Type": "String",
412412
"Default": "10.0.0.0/16",
413413
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(1[6-9]|2[0-8]))$",
414-
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28"
414+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28."
415415
},
416416
"PublicSubnet1CIDR": {
417-
"Description": "CIDR Block for the Public Subnet 1",
417+
"Description": "CIDR Block for the Public Subnet 1.",
418418
"Type": "String",
419419
"Default": "10.0.0.0/24",
420420
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(1[6-9]|2[0-8]))$",
421-
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28"
421+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28."
422422
},
423423
"PublicSubnet2CIDR": {
424-
"Description": "CIDR Block for the Public Subnet 2",
424+
"Description": "CIDR Block for the Public Subnet 2.",
425425
"Type": "String",
426426
"Default": "10.0.2.0/24",
427427
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(1[6-9]|2[0-8]))$",
428-
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28"
428+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28."
429429
},
430430
"PrivateSubnet1CIDR": {
431-
"Description": "CIDR Block for the Private Subnet 1",
431+
"Description": "CIDR Block for the Private Subnet 1.",
432432
"Type": "String",
433433
"Default": "10.0.1.0/24",
434434
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(1[6-9]|2[0-8]))$",
435-
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28"
435+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28."
436436
},
437437
"PrivateSubnet2CIDR": {
438-
"Description": "CIDR Block for the Private Subnet 2",
438+
"Description": "CIDR Block for the Private Subnet 2.",
439439
"Type": "String",
440440
"Default": "10.0.3.0/24",
441441
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(1[6-9]|2[0-8]))$",
442-
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28"
442+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/16-28."
443443
},
444444
"BastionInstanceType": {
445445
"AllowedValues": [
@@ -457,7 +457,7 @@
457457
"m4.4xlarge"
458458
],
459459
"Default": "t2.micro",
460-
"Description": "Amazon EC2 instance type for the bastion instances",
460+
"Description": "Amazon EC2 instance type for the bastion instances.",
461461
"Type": "String"
462462
},
463463
"BastionAMIOS": {
@@ -468,25 +468,25 @@
468468
"Ubuntu-Server-16.04-LTS-HVM"
469469
],
470470
"Default": "Amazon-Linux-HVM",
471-
"Description": "The Linux distribution for the AMI to be used for the bastion instances",
471+
"Description": "The Linux distribution for the AMI to be used for the bastion instances.",
472472
"Type": "String"
473473
},
474474
"RemoteAccessCIDR": {
475-
"Description": "Allowed CIDR block for external SSH access to the bastions i.e x.x.x.x/16-28",
476-
"Type": "String",
477-
"AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
478-
"ConstraintDescription": "must be a valid CIDR range of the form x.x.x.x/16-28."
475+
"AllowedPattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
476+
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/x.",
477+
"Description": "The CIDR IP range that is permitted to access the bastion host. We recommend that you set this value to a trusted IP range i.e <your system public ip>/24.",
478+
"Type": "String"
479479
},
480480
"KeyPairName": {
481-
"Description": "Name of an existing EC2 Key Pair",
481+
"Description": "Name of an existing EC2 Key Pair.",
482482
"Type": "AWS::EC2::KeyPair::KeyName",
483483
"MinLength": "1",
484484
"ConstraintDescription": "must be the name of an existing EC2 KeyPair."
485485
},
486486
"OperatorEmail": {
487487
"AllowedPattern": "([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)",
488488
"ConstraintDescription": "Must be a valid email address.",
489-
"Description": "Email address that notifications of any scaling operations will be sent to",
489+
"Description": "Email address that notifications of any scaling operations will be sent to.",
490490
"Type": "String"
491491
}
492492
},
@@ -646,4 +646,4 @@
646646
}
647647
}
648648
}
649-
}
649+
}

0 commit comments

Comments
 (0)