Skip to content

Commit b44e107

Browse files
dheren-gitdheren-git
committed
spectrum-scale-update-aws4
1 parent 3e7733f commit b44e107

File tree

3 files changed

+441
-609
lines changed

3 files changed

+441
-609
lines changed

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

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
"d2.8xlarge",
376376
"i2.xlarge",
377377
"i2.2xlarge",
378-
"i2.4xlarge",
378+
"i2.4xlarge",
379379
"i2.8xlarge",
380380
"i3.large",
381381
"i3.xlarge",
@@ -471,7 +471,7 @@
471471
"d2.8xlarge",
472472
"i2.xlarge",
473473
"i2.2xlarge",
474-
"i2.4xlarge",
474+
"i2.4xlarge",
475475
"i2.8xlarge",
476476
"i3.large",
477477
"i3.xlarge",
@@ -571,7 +571,7 @@
571571
"RemoteAccessCIDR": {
572572
"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]))$",
573573
"ConstraintDescription": "CIDR block parameter must be in the form x.x.x.x/x.",
574-
"Description": "CIDR block that’s allowed external SSH access to the bastion hosts, e.g., x.x.x.x/16-28. We recommend that you set this value to a trusted CIDR block. For example, you might want to restrict access to your corporate network.",
574+
"Description": "CIDR block thats allowed external SSH access to the bastion hosts, e.g., x.x.x.x/16-28. We recommend that you set this value to a trusted CIDR block. For example, you might want to restrict access to your corporate network.",
575575
"Type": "String"
576576
},
577577
"KeyPairName": {
@@ -599,10 +599,10 @@
599599
"ReplicaOneCondition": {
600600
"Fn::Equals": [
601601
{
602-
"Ref": "DataReplica"
603-
},
604-
"1"
605-
]
602+
"Ref": "DataReplica"
603+
},
604+
"1"
605+
]
606606
}
607607
},
608608
"Resources": {
@@ -612,7 +612,7 @@
612612
"TemplateURL": {
613613
"Fn::Sub": "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}submodules/quickstart-aws-vpc/templates/aws-vpc.template"
614614
},
615-
"Tags" : [ { "Key" : "Version", "Value" : "v1.2" } ],
615+
"Tags" : [ { "Key" : "Version", "Value" : "v1.3" } ],
616616
"Parameters": {
617617
"AvailabilityZones": {
618618
"Fn::Join": [
@@ -641,12 +641,14 @@
641641
"Ref": "VPCCIDR"
642642
},
643643
"CreatePrivateSubnets": {
644-
"Fn::If": [
645-
"ReplicaOneCondition",
646-
"false",
647-
"true"
648-
]}
649-
}
644+
"Fn::If":
645+
[
646+
"ReplicaOneCondition",
647+
"false",
648+
"true"
649+
]
650+
}
651+
}
650652
}
651653
},
652654
"SubnetNATStack": {
@@ -657,7 +659,7 @@
657659
"TemplateURL": {
658660
"Fn::Sub": "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/ibm-spectrum-scale-subnet.template"
659661
},
660-
"Tags" : [ { "Key" : "Version", "Value" : "v1.2" } ],
662+
"Tags" : [ { "Key" : "Version", "Value" : "v1.3" } ],
661663
"Parameters": {
662664
"AvailabilityZones": {
663665
"Fn::Join": [
@@ -691,7 +693,7 @@
691693
"Outputs.PublicSubnet1ID"
692694
]
693695
}
694-
}
696+
}
695697
}
696698
},
697699
"BastionStack": {
@@ -701,7 +703,7 @@
701703
"TemplateURL": {
702704
"Fn::Sub": "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}submodules/quickstart-linux-bastion/templates/linux-bastion.template"
703705
},
704-
"Tags" : [ { "Key" : "Version", "Value" : "v1.2" } ],
706+
"Tags" : [ { "Key" : "Version", "Value" : "v1.3" } ],
705707
"Parameters": {
706708
"BastionAMIOS": {
707709
"Ref": "BastionAMIOS"
@@ -749,7 +751,7 @@
749751
"TemplateURL": {
750752
"Fn::Sub": "https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/ibm-spectrum-scale.template"
751753
},
752-
"Tags" : [ { "Key" : "Version", "Value" : "v1.2" } ],
754+
"Tags" : [ { "Key" : "Version", "Value" : "v1.3" } ],
753755
"Parameters": {
754756
"BlockSize": {
755757
"Ref": "BlockSize"
@@ -782,39 +784,44 @@
782784
"Ref": "ComputeInstanceType"
783785
},
784786
"PrivateSubnet1ID": {
785-
"Fn::If": [
786-
"ReplicaOneCondition",
787-
{
788-
"Fn::GetAtt": [
789-
"SubnetNATStack",
790-
"Outputs.PrivateSubnetID"
791-
]
792-
},
793-
{
794-
"Fn::GetAtt": [
795-
"VPCStack",
796-
"Outputs.PrivateSubnet1AID"
797-
]
798-
}
799-
]
787+
"Fn::If":
788+
[
789+
"ReplicaOneCondition",
790+
{
791+
"Fn::GetAtt":
792+
[
793+
"SubnetNATStack",
794+
"Outputs.PrivateSubnetID"
795+
]
796+
},
797+
{
798+
"Fn::GetAtt":
799+
[
800+
"VPCStack",
801+
"Outputs.PrivateSubnet1AID"
802+
]
803+
}
804+
]
800805
},
801806
"PrivateSubnet2ID": {
802-
"Fn::If": [
803-
"ReplicaOneCondition",
804-
{
805-
"Fn::GetAtt": [
806-
"SubnetNATStack",
807-
"Outputs.PrivateSubnetID"
808-
]
809-
},
810-
{
811-
"Fn::GetAtt": [
812-
"VPCStack",
813-
"Outputs.PrivateSubnet2AID"
814-
]
815-
}
816-
817-
]
807+
"Fn::If":
808+
[
809+
"ReplicaOneCondition",
810+
{
811+
"Fn::GetAtt":
812+
[
813+
"SubnetNATStack",
814+
"Outputs.PrivateSubnetID"
815+
]
816+
},
817+
{
818+
"Fn::GetAtt":
819+
[
820+
"VPCStack",
821+
"Outputs.PrivateSubnet2AID"
822+
]
823+
}
824+
]
818825
},
819826
"VpcId": {
820827
"Fn::GetAtt": [
@@ -845,7 +852,7 @@
845852
}
846853
},
847854
"Outputs" : {
848-
"StackName": {
855+
"StackName": {
849856
"Value": {
850857
"Ref": "AWS::StackName"
851858
},
@@ -864,12 +871,12 @@
864871
"Description": "Master Template Path"
865872
},
866873
"Version": {
867-
"Value": "v1.2",
874+
"Value": "v1.3",
868875
"Description": "Template version"
869876
},
870877
"SpectrumScaleVersion":{
871-
"Value": "4.2.3.1",
872-
"Description": "Spectrum Scale version included with this release"
878+
"Value": "4.2.3.7",
879+
"Description": "Spectrum Scale version included with this release"
873880
},
874881
"SpectrumS3Bucket": {
875882
"Value": {
@@ -879,8 +886,6 @@
879886
]
880887
},
881888
"Description": "Spectrum Scale S3 bucket name"
882-
883889
}
884-
885-
}
890+
}
886891
}

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
3-
<<<<<<< HEAD
4-
"Description": "This template creates a one private subnet and NAT Gateway for one Availability Zone. If you deploy this template in a region that doesn't support NAT gateways, NAT instances are deployed instead. **WARNING** This template will only call when user choose dataReplica=1.",
5-
=======
63
"Description": "This template creates a private subnet and NAT Gateway in a single Availability Zone. If you deploy this template in a region that doesn't support NAT gateways, NAT instances are deployed instead. This template is used only when dataReplica=1.",
7-
>>>>>>> upstream/master
84
"Parameters": {
95
"VPCCIDR": {
106
"Description": "CIDR block for the VPC.",
@@ -68,7 +64,7 @@
6864
"us-gov-west-1"
6965
]
7066
},
71-
"NATGatewayCondition": {
67+
"NATGatewayCondition": {
7268
"Fn::Not": [
7369
{
7470
"Condition": "GovCloudCondition"
@@ -81,7 +77,7 @@
8177
"Type": "AWS::EC2::Subnet",
8278
"Properties": {
8379
"VpcId": {
84-
"Ref": "VpcId"
80+
"Ref": "VpcId"
8581
},
8682
"CidrBlock": {
8783
"Ref": "PrivateSubnet1ACIDR"
@@ -229,8 +225,8 @@
229225
"DeviceIndex": "0",
230226
"DeleteOnTermination": "true",
231227
"SubnetId": {
232-
"Ref": "PublicSubnet1ID"
233-
}
228+
"Ref": "PublicSubnet1ID"
229+
}
234230
}
235231
],
236232
"KeyName": {
@@ -270,7 +266,7 @@
270266
},
271267
"Outputs" : {
272268
"Version": {
273-
"Value": "v1.2",
269+
"Value": "v1.3",
274270
"Description": "Template version"
275271
},
276272
"PrivateSubnetID": {
@@ -285,8 +281,8 @@
285281
}
286282
},
287283
"SpectrumScaleVersion":{
288-
"Value": "4.2.3.1",
289-
"Description": "Spectrum Scale version included with this release"
284+
"Value": "4.2.3.7",
285+
"Description": "Spectrum Scale version included with this release"
290286
}
291-
}
287+
}
292288
}

0 commit comments

Comments
 (0)