Merge pull request #719 from edx/feanil/admin_stack

Feanil/admin stack

cloudformation_templates/edx-admin-reference-architecture.json

@@ -98,6 +98,11 @@
       "Description":"The TCP port for the Asgard server",
       "Type":"Number",
       "Default":"8090"
+    },
+    "MongoServicePort":{
+      "Description":"The TCP port for the deployment mongo server",
+      "Type":"Number",
+      "Default":"10001"
     }
   },
   "Mappings":{
@@ -567,6 +572,14 @@
         "SecurityGroupIngress":[
           {
             "IpProtocol":"tcp",
+            "FromPort":"22",
+            "ToPort":"22",
+            "CidrIp":{
+              "Ref":"SSHLocation"
+            }
+          },
+          {
+            "IpProtocol":"tcp",
             "FromPort":"80",
             "ToPort":"80",
             "CidrIp":"0.0.0.0/0"
@@ -579,14 +592,20 @@
           },
           {
             "IpProtocol":"tcp",
+            "FromPort":{ "Ref": "MongoServicePort" },
+            "ToPort":{ "Ref": "MongoServicePort" },
+            "CidrIp":"0.0.0.0/0"
+          }
+        ],
+        "SecurityGroupEgress":[
+          {
+            "IpProtocol":"tcp",
             "FromPort":"22",
             "ToPort":"22",
             "CidrIp":{
               "Ref":"SSHLocation"
             }
-          }
-        ],
-        "SecurityGroupEgress":[
+          },
           {
             "IpProtocol":"tcp",
             "FromPort":"80",
@@ -601,11 +620,9 @@
           },
           {
             "IpProtocol":"tcp",
-            "FromPort":"22",
-            "ToPort":"22",
-            "CidrIp":{
-              "Ref":"SSHLocation"
-            }
+            "FromPort":{ "Ref": "MongoServicePort" },
+            "ToPort":{ "Ref": "MongoServicePort" },
+            "CidrIp":"0.0.0.0/0"
           }
         ]
       }
@@ -726,13 +743,7 @@
                 "Statement":[
                   {
                     "Effect":"Allow",
-                    "Action":[
-                      "s3:Get*",
-                      "s3:List*",
-                      "ses:SendEmail",
-                      "ses:SendRawEmail",
-                      "ses:GetSendQuota"
-                    ],
+                    "Action": "*",
                     "Resource":"*"
                   }
                 ]

util/vpc-tools/vpc-tools.py

@@ -88,8 +88,10 @@ def _ssh_config(args):
                 logical_id = instance.tags['role']
             elif 'group' in instance.tags:
                 logical_id = instance.tags['group']
-            else:
+            elif 'aws:cloudformation:logical-id' in instance.tags:
                 logical_id = instance.tags['aws:cloudformation:logical-id']
+            else:
+                continue
             instance_number = id_type_counter[logical_id]
             id_type_counter[logical_id] += 1