Skip to content

C
configuration
Commit 616ae06b by Feanil Patel
Options

Merge pull request #719 from edx/feanil/admin_stack 

Feanil/admin stack
parents f1718849 83ea04c4
Showing with 29 additions and 16 deletions
cloudformation_templates/edx-admin-reference-architecture.json
...@@ -98,6 +98,11 @@ ...@@ -98,6 +98,11 @@
"Description":"The TCP port for the Asgard server", "Description":"The TCP port for the Asgard server",
"Type":"Number", "Type":"Number",
"Default":"8090" "Default":"8090"
},
"MongoServicePort":{
"Description":"The TCP port for the deployment mongo server",
"Type":"Number",
"Default":"10001"
} }
}, },
"Mappings":{ "Mappings":{
...@@ -567,6 +572,14 @@ ...@@ -567,6 +572,14 @@
"SecurityGroupIngress":[ "SecurityGroupIngress":[
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"22",
"ToPort":"22",
"CidrIp":{
"Ref":"SSHLocation"
}
},
{
"IpProtocol":"tcp",
"FromPort":"80", "FromPort":"80",
"ToPort":"80", "ToPort":"80",
"CidrIp":"0.0.0.0/0" "CidrIp":"0.0.0.0/0"
...@@ -579,14 +592,20 @@ ...@@ -579,14 +592,20 @@
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":{ "Ref": "MongoServicePort" },
"ToPort":{ "Ref": "MongoServicePort" },
"CidrIp":"0.0.0.0/0"
}
],
"SecurityGroupEgress":[
{
"IpProtocol":"tcp",
"FromPort":"22", "FromPort":"22",
"ToPort":"22", "ToPort":"22",
"CidrIp":{ "CidrIp":{
"Ref":"SSHLocation" "Ref":"SSHLocation"
} }
} },
],
"SecurityGroupEgress":[
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"80", "FromPort":"80",
...@@ -601,11 +620,9 @@ ...@@ -601,11 +620,9 @@
}, },
{ {
"IpProtocol":"tcp", "IpProtocol":"tcp",
"FromPort":"22", "FromPort":{ "Ref": "MongoServicePort" },
"ToPort":"22", "ToPort":{ "Ref": "MongoServicePort" },
"CidrIp":{ "CidrIp":"0.0.0.0/0"
"Ref":"SSHLocation"
}
} }
] ]
} }
...@@ -726,13 +743,7 @@ ...@@ -726,13 +743,7 @@
"Statement":[ "Statement":[
{ {
"Effect":"Allow", "Effect":"Allow",
"Action":[ "Action": "*",
"s3:Get*",
"s3:List*",
"ses:SendEmail",
"ses:SendRawEmail",
"ses:GetSendQuota"
],
"Resource":"*" "Resource":"*"
} }
] ]
......
util/vpc-tools/vpc-tools.py
...@@ -88,8 +88,10 @@ def _ssh_config(args): ...@@ -88,8 +88,10 @@ def _ssh_config(args):
logical_id = instance.tags['role'] logical_id = instance.tags['role']
elif 'group' in instance.tags: elif 'group' in instance.tags:
logical_id = instance.tags['group'] logical_id = instance.tags['group']
else: elif 'aws:cloudformation:logical-id' in instance.tags:
logical_id = instance.tags['aws:cloudformation:logical-id'] logical_id = instance.tags['aws:cloudformation:logical-id']
else:
continue
instance_number = id_type_counter[logical_id] instance_number = id_type_counter[logical_id]
id_type_counter[logical_id] += 1 id_type_counter[logical_id] += 1
......
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