Skip to content

C
configuration
Commit ce7a9cf6 by Feanil Patel
Options

Fix spelling and make the xserver name consistent with everything else.

parent efff5902
Showing with 37 additions and 37 deletions
cloudformation_templates/edx-reference-architecture.json
...@@ -3047,7 +3047,7 @@ ...@@ -3047,7 +3047,7 @@
] ]
} }
}, },
"EdxappServerASGroup":{ "EdxappServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -3122,7 +3122,7 @@ ...@@ -3122,7 +3122,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"EdxappServerASGroup" "Ref":"EdxappServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"1" "ScalingAdjustment":"1"
...@@ -3133,7 +3133,7 @@ ...@@ -3133,7 +3133,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"EdxappServerASGroup" "Ref":"EdxappServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"-1" "ScalingAdjustment":"-1"
...@@ -3158,7 +3158,7 @@ ...@@ -3158,7 +3158,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"EdxappServerASGroup" "Ref":"EdxappServerAsGroup"
} }
} }
], ],
...@@ -3184,7 +3184,7 @@ ...@@ -3184,7 +3184,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"EdxappServerASGroup" "Ref":"EdxappServerAsGroup"
} }
} }
], ],
...@@ -3370,7 +3370,7 @@ ...@@ -3370,7 +3370,7 @@
] ]
} }
}, },
"XqueueServerASGroup":{ "XqueueServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -3445,7 +3445,7 @@ ...@@ -3445,7 +3445,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"XqueueServerASGroup" "Ref":"XqueueServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"1" "ScalingAdjustment":"1"
...@@ -3456,7 +3456,7 @@ ...@@ -3456,7 +3456,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"XqueueServerASGroup" "Ref":"XqueueServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"-1" "ScalingAdjustment":"-1"
...@@ -3481,7 +3481,7 @@ ...@@ -3481,7 +3481,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"XqueueServerASGroup" "Ref":"XqueueServerAsGroup"
} }
} }
], ],
...@@ -3507,7 +3507,7 @@ ...@@ -3507,7 +3507,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"XqueueServerASGroup" "Ref":"XqueueServerAsGroup"
} }
} }
], ],
...@@ -3679,7 +3679,7 @@ ...@@ -3679,7 +3679,7 @@
] ]
} }
}, },
"CommonClusterServerASGroup":{ "CommonClusterServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -3776,7 +3776,7 @@ ...@@ -3776,7 +3776,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"CommonClusterServerASGroup" "Ref":"CommonClusterServerAsGroup"
} }
} }
], ],
...@@ -3798,7 +3798,7 @@ ...@@ -3798,7 +3798,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"CommonClusterServerASGroup" "Ref":"CommonClusterServerAsGroup"
} }
} }
], ],
...@@ -4209,13 +4209,13 @@ ...@@ -4209,13 +4209,13 @@
] ]
} }
}, },
"XServer":{ "XserverServer":{
"Type":"AWS::AutoScaling::LaunchConfiguration", "Type":"AWS::AutoScaling::LaunchConfiguration",
"Properties":{ "Properties":{
"IamInstanceProfile":{ "Ref":"XServerInstanceProfile" }, "IamInstanceProfile":{ "Ref":"XServerInstanceProfile" },
"SecurityGroups":[ "SecurityGroups":[
{ {
"Ref":"XServerSecurityGroup" "Ref":"XserverServerSecurityGroup"
} }
], ],
"ImageId":{ "ImageId":{
...@@ -4251,7 +4251,7 @@ ...@@ -4251,7 +4251,7 @@
] ]
} }
}, },
"XServerASGroup":{ "XserverServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -4303,7 +4303,7 @@ ...@@ -4303,7 +4303,7 @@
} }
], ],
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"XServer" "Ref":"XserverServer"
}, },
"MinSize":{ "MinSize":{
"Ref":"XServerDesiredCapacity" "Ref":"XServerDesiredCapacity"
...@@ -4321,23 +4321,23 @@ ...@@ -4321,23 +4321,23 @@
] ]
} }
}, },
"XServerScaleUpPolicy":{ "XserverServerScaleUpPolicy":{
"Type":"AWS::AutoScaling::ScalingPolicy", "Type":"AWS::AutoScaling::ScalingPolicy",
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"XServerASGroup" "Ref":"XserverServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"1" "ScalingAdjustment":"1"
} }
}, },
"XServerScaleDownPolicy":{ "XserverServerScaleDownPolicy":{
"Type":"AWS::AutoScaling::ScalingPolicy", "Type":"AWS::AutoScaling::ScalingPolicy",
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"XServerASGroup" "Ref":"XserverServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"-1" "ScalingAdjustment":"-1"
...@@ -4355,14 +4355,14 @@ ...@@ -4355,14 +4355,14 @@
"Threshold":"90", "Threshold":"90",
"AlarmActions":[ "AlarmActions":[
{ {
"Ref":"XServerScaleUpPolicy" "Ref":"XserverServerScaleUpPolicy"
} }
], ],
"Dimensions":[ "Dimensions":[
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"XServerASGroup" "Ref":"XserverServerAsGroup"
} }
} }
], ],
...@@ -4381,14 +4381,14 @@ ...@@ -4381,14 +4381,14 @@
"Threshold":"70", "Threshold":"70",
"AlarmActions":[ "AlarmActions":[
{ {
"Ref":"XServerScaleDownPolicy" "Ref":"XserverServerScaleDownPolicy"
} }
], ],
"Dimensions":[ "Dimensions":[
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"XServerASGroup" "Ref":"XserverServerAsGroup"
} }
} }
], ],
...@@ -4465,7 +4465,7 @@ ...@@ -4465,7 +4465,7 @@
] ]
} }
}, },
"XServerSecurityGroup":{ "XserverServerSecurityGroup":{
"Type":"AWS::EC2::SecurityGroup", "Type":"AWS::EC2::SecurityGroup",
"Properties":{ "Properties":{
"GroupDescription":"Open up SSH access plus XServer required ports", "GroupDescription":"Open up SSH access plus XServer required ports",
...@@ -4680,7 +4680,7 @@ ...@@ -4680,7 +4680,7 @@
] ]
} }
}, },
"WorkerServerASGroup":{ "WorkerServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -4750,7 +4750,7 @@ ...@@ -4750,7 +4750,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"WorkerServerASGroup" "Ref":"WorkerServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"1" "ScalingAdjustment":"1"
...@@ -4761,7 +4761,7 @@ ...@@ -4761,7 +4761,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"WorkerServerASGroup" "Ref":"WorkerServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"-1" "ScalingAdjustment":"-1"
...@@ -4786,7 +4786,7 @@ ...@@ -4786,7 +4786,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"WorkerServerASGroup" "Ref":"WorkerServerAsGroup"
} }
} }
], ],
...@@ -4812,7 +4812,7 @@ ...@@ -4812,7 +4812,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"WorkerServerASGroup" "Ref":"WorkerServerAsGroup"
} }
} }
], ],
...@@ -4897,7 +4897,7 @@ ...@@ -4897,7 +4897,7 @@
] ]
} }
}, },
"ForumServerASGroup":{ "ForumServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
...@@ -4972,7 +4972,7 @@ ...@@ -4972,7 +4972,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"ForumServerASGroup" "Ref":"ForumServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"1" "ScalingAdjustment":"1"
...@@ -4983,7 +4983,7 @@ ...@@ -4983,7 +4983,7 @@
"Properties":{ "Properties":{
"AdjustmentType":"ChangeInCapacity", "AdjustmentType":"ChangeInCapacity",
"AutoScalingGroupName":{ "AutoScalingGroupName":{
"Ref":"ForumServerASGroup" "Ref":"ForumServerAsGroup"
}, },
"Cooldown":"60", "Cooldown":"60",
"ScalingAdjustment":"-1" "ScalingAdjustment":"-1"
...@@ -5008,7 +5008,7 @@ ...@@ -5008,7 +5008,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"ForumServerASGroup" "Ref":"ForumServerAsGroup"
} }
} }
], ],
...@@ -5034,7 +5034,7 @@ ...@@ -5034,7 +5034,7 @@
{ {
"Name":"AutoScalingGroupName", "Name":"AutoScalingGroupName",
"Value":{ "Value":{
"Ref":"ForumServerASGroup" "Ref":"ForumServerAsGroup"
} }
} }
], ],
...@@ -5288,7 +5288,7 @@ ...@@ -5288,7 +5288,7 @@
] ]
} }
}, },
"MongoServerASGroup":{ "MongoServerAsGroup":{
"Type":"AWS::AutoScaling::AutoScalingGroup", "Type":"AWS::AutoScaling::AutoScalingGroup",
"Properties":{ "Properties":{
"AvailabilityZones":[ "AvailabilityZones":[
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment