Commit c64d4f55 by Feanil Patel

Working custom subnets.

parent b6ced2a4
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
"Properties":{ "Properties":{
"EnableDnsSupport" : "true", "EnableDnsSupport" : "true",
"EnableDnsHostnames" : "true", "EnableDnsHostnames" : "true",
"CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, "0.0.0/16"]]}, "CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]},
"InstanceTenancy":"default" "InstanceTenancy":"default"
} }
}, },
...@@ -1764,7 +1764,7 @@ ...@@ -1764,7 +1764,7 @@
"Protocol":"1", "Protocol":"1",
"RuleAction":"allow", "RuleAction":"allow",
"Egress":"false", "Egress":"false",
"CidrBlock":"10.0.0.0/16", "CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]},
"Icmp": { "Icmp": {
"Code": "0", "Code": "0",
"Type": "0" "Type": "0"
...@@ -1781,7 +1781,7 @@ ...@@ -1781,7 +1781,7 @@
"Protocol":"1", "Protocol":"1",
"RuleAction":"allow", "RuleAction":"allow",
"Egress":"false", "Egress":"false",
"CidrBlock":"10.0.0.0/16", "CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]},
"Icmp": { "Icmp": {
"Code": "0", "Code": "0",
"Type": "8" "Type": "8"
...@@ -1815,7 +1815,7 @@ ...@@ -1815,7 +1815,7 @@
"Protocol":"1", "Protocol":"1",
"RuleAction":"allow", "RuleAction":"allow",
"Egress":"true", "Egress":"true",
"CidrBlock":"10.0.0.0/16", "CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]},
"Icmp": { "Icmp": {
"Code": "0", "Code": "0",
"Type": "0" "Type": "0"
...@@ -1832,7 +1832,7 @@ ...@@ -1832,7 +1832,7 @@
"Protocol":"1", "Protocol":"1",
"RuleAction":"allow", "RuleAction":"allow",
"Egress":"true", "Egress":"true",
"CidrBlock":"10.0.0.0/16", "CidrBlock": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]},
"Icmp": { "Icmp": {
"Code": "0", "Code": "0",
"Type": "8" "Type": "8"
...@@ -2871,7 +2871,7 @@ ...@@ -2871,7 +2871,7 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"22", "FromPort":"22",
"ToPort":"22", "ToPort":"22",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
...@@ -3841,27 +3841,51 @@ ...@@ -3841,27 +3841,51 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"9200", "FromPort":"9200",
"ToPort":"9200", "ToPort":"9200",
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "ForumServerSecurityGroup" }
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"9300", "FromPort":"9300",
"ToPort":"9300", "ToPort":"9300",
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "ForumServerSecurityGroup" }
} }
], ],
"SecurityGroupEgress":[ "SecurityGroupEgress":[
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"9200", "FromPort": 9200,
"ToPort":"9200", "ToPort": 9200,
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"9300", "FromPort": 9300,
"ToPort":"9300", "ToPort": 9300,
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
} }
] ]
} }
...@@ -3886,13 +3910,61 @@ ...@@ -3886,13 +3910,61 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort": 9200, "FromPort": 9200,
"ToPort": 9200, "ToPort": 9200,
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "ElasticSearchELBSecurityGroup" }
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort": 9300, "FromPort": 9300,
"ToPort": 9300, "ToPort": 9300,
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "ElasticSearchELBSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"SourceSecurityGroupId": { "Ref": "ForumServerSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"SourceSecurityGroupId": { "Ref": "ForumServerSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9200,
"ToPort": 9200,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": 9300,
"ToPort": 9300,
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
} }
] ]
} }
...@@ -3950,13 +4022,25 @@ ...@@ -3950,13 +4022,25 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"5672", "FromPort":"5672",
"ToPort":"5672", "ToPort":"5672",
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "EdxappServerSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort":"6163",
"ToPort":"6163",
"SourceSecurityGroupId": { "Ref": "EdxappServerSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort":"5672",
"ToPort":"5672",
"SourceSecurityGroupId": { "Ref": "XqueueServerSecurityGroup" }
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"6163", "FromPort":"6163",
"ToPort":"6163", "ToPort":"6163",
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "XqueueServerSecurityGroup" }
} }
], ],
"SecurityGroupEgress":[ "SecurityGroupEgress":[
...@@ -3964,13 +4048,37 @@ ...@@ -3964,13 +4048,37 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"5672", "FromPort":"5672",
"ToPort":"5672", "ToPort":"5672",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"6163",
"ToPort":"6163",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"5672",
"ToPort":"5672",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"6163", "FromPort":"6163",
"ToPort":"6163", "ToPort":"6163",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"5672",
"ToPort":"5672",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"6163",
"ToPort":"6163",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
} }
] ]
} }
...@@ -3987,7 +4095,7 @@ ...@@ -3987,7 +4095,7 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"22", "FromPort":"22",
"ToPort":"22", "ToPort":"22",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
...@@ -4023,9 +4131,37 @@ ...@@ -4023,9 +4131,37 @@
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"5672",
"ToPort":"5672",
"SourceSecurityGroupId" : {
"Ref" : "EdxappServerSecurityGroup"
}
},
{
"IpProtocol":"tcp",
"FromPort":"6163",
"ToPort":"6163",
"SourceSecurityGroupId" : {
"Ref" : "EdxappServerSecurityGroup"
}
},
{
"IpProtocol":"tcp",
"FromPort":"0",
"ToPort":"65535",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"0", "FromPort":"0",
"ToPort":"65535", "ToPort":"65535",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster02", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort":"0",
"ToPort":"65535",
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "CommonCluster03", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
...@@ -4288,15 +4424,21 @@ ...@@ -4288,15 +4424,21 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"80", "FromPort":"80",
"ToPort":"80", "ToPort":"80",
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "XqueueServerSecurityGroup" }
} }
], ],
"SecurityGroupEgress":[ "SecurityGroupEgress":[
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"80", "FromPort": {"Ref": "XserverServerPort"},
"ToPort":"80", "ToPort": {"Ref": "XserverServerPort"},
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "XServerJail01", "CIDR"]}]]}
},
{
"IpProtocol":"tcp",
"FromPort": {"Ref": "XserverServerPort"},
"ToPort": {"Ref": "XserverServerPort"},
"CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "XServerJail02", "CIDR"]}]]}
} }
] ]
} }
...@@ -4313,21 +4455,13 @@ ...@@ -4313,21 +4455,13 @@
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"22", "FromPort":"22",
"ToPort":"22", "ToPort":"22",
"CidrIp":"10.0.0.0/16" "CidrIp": { "Fn::Join": ["", ["10.", { "Ref": "ClassB" }, { "Fn::FindInMap": [ "SubnetConfig", "VPC", "CIDR"]}]]}
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort": { "Ref": "XserverServerPort" }, "FromPort": { "Ref": "XserverServerPort" },
"ToPort": { "Ref": "XserverServerPort" }, "ToPort": { "Ref": "XserverServerPort" },
"CidrIp":"10.0.0.0/16" "SourceSecurityGroupId": { "Ref": "XServerELBSecurityGroup" }
},
{
"IpProtocol":"tcp",
"FromPort":"80",
"ToPort":"80",
"SourceSecurityGroupId" : {
"Ref" : "XServerELBSecurityGroup"
}
} }
], ],
"Tags":[ "Tags":[
...@@ -5248,11 +5382,14 @@ ...@@ -5248,11 +5382,14 @@
"FromPort":"27017", "FromPort":"27017",
"ToPort":"27017", "ToPort":"27017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo01", "Mongo01",
"CIDR" "CIDR"
] ]}
]]
} }
}, },
{ {
...@@ -5260,11 +5397,14 @@ ...@@ -5260,11 +5397,14 @@
"FromPort":"28017", "FromPort":"28017",
"ToPort":"28017", "ToPort":"28017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo01", "Mongo01",
"CIDR" "CIDR"
] ]}
]]
} }
}, },
{ {
...@@ -5272,11 +5412,14 @@ ...@@ -5272,11 +5412,14 @@
"FromPort":"27017", "FromPort":"27017",
"ToPort":"27017", "ToPort":"27017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo02", "Mongo02",
"CIDR" "CIDR"
] ]}
]]
} }
}, },
{ {
...@@ -5284,11 +5427,14 @@ ...@@ -5284,11 +5427,14 @@
"FromPort":"28017", "FromPort":"28017",
"ToPort":"28017", "ToPort":"28017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo02", "Mongo02",
"CIDR" "CIDR"
] ]}
]]
} }
}, },
{ {
...@@ -5296,11 +5442,14 @@ ...@@ -5296,11 +5442,14 @@
"FromPort":"27017", "FromPort":"27017",
"ToPort":"27017", "ToPort":"27017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo03", "Mongo03",
"CIDR" "CIDR"
] ]}
]]
} }
}, },
{ {
...@@ -5308,11 +5457,14 @@ ...@@ -5308,11 +5457,14 @@
"FromPort":"28017", "FromPort":"28017",
"ToPort":"28017", "ToPort":"28017",
"CidrIp":{ "CidrIp":{
"Fn::FindInMap":[ "Fn::Join": ["", [
"10.", { "Ref": "ClassB"},
{"Fn::FindInMap":[
"SubnetConfig", "SubnetConfig",
"Mongo03", "Mongo03",
"CIDR" "CIDR"
] ]}
]]
} }
} }
], ],
......
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