Merge pull request #567 from edx/feanil/correct_cfn

Correctly reference instance type in server names.

cloudformation_templates/edx-reference-architecture.json

@@ -16,7 +16,7 @@
       "Description":"Name of an existing EC2 KeyPair to enable SSH access to the web server",
       "Default":"deployment"
     },
-    "InstanceType":{
+    "EdxappInstanceType":{
       "Description":"WebServer EC2 instance type",
       "Type":"String",
       "Default":"m1.small",
@@ -131,6 +131,52 @@
       ],
       "ConstraintDescription":"must be a valid EC2 instance type."
     },
+    "XserverInstanceType":{
+      "Description":"RabbitMQ server EC2 instance type",
+      "Type":"String",
+      "Default":"m1.small",
+      "AllowedValues":[
+        "t1.micro",
+        "m1.small",
+        "m1.medium",
+        "m1.large",
+        "m1.xlarge",
+        "m2.xlarge",
+        "m2.2xlarge",
+        "m2.4xlarge",
+        "m3.xlarge",
+        "m3.2xlarge",
+        "c1.medium",
+        "c1.xlarge",
+        "cc1.4xlarge",
+        "cc2.8xlarge",
+        "cg1.4xlarge"
+      ],
+      "ConstraintDescription":"must be a valid EC2 instance type."
+    },
+    "XqueueInstanceType":{
+      "Description":"RabbitMQ server EC2 instance type",
+      "Type":"String",
+      "Default":"m1.small",
+      "AllowedValues":[
+        "t1.micro",
+        "m1.small",
+        "m1.medium",
+        "m1.large",
+        "m1.xlarge",
+        "m2.xlarge",
+        "m2.2xlarge",
+        "m2.4xlarge",
+        "m3.xlarge",
+        "m3.2xlarge",
+        "c1.medium",
+        "c1.xlarge",
+        "cc1.4xlarge",
+        "cc2.8xlarge",
+        "cg1.4xlarge"
+      ],
+      "ConstraintDescription":"must be a valid EC2 instance type."
+    },
     "SSHLocation":{
       "Description":"The IP address range that can be used to SSH to the EC2 instances",
       "Type":"String",
@@ -2475,7 +2521,7 @@
               "Fn::FindInMap":[
                 "AWSInstanceType2Arch",
                 {
-                  "Ref":"InstanceType"
+                  "Ref":"EdxappInstanceType"
                 },
                 "Arch"
               ]
@@ -2522,7 +2568,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"EdxappInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -2830,7 +2876,7 @@
               "Fn::FindInMap":[
                 "AWSInstanceType2Arch",
                 {
-                  "Ref":"InstanceType"
+                  "Ref":"XqueueInstanceType"
                 },
                 "Arch"
               ]
@@ -2873,7 +2919,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"XqueueInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -3207,7 +3253,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"RabbitInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -3534,7 +3580,7 @@
               "Fn::FindInMap":[
                 "AWSInstanceType2Arch",
                 {
-                  "Ref":"InstanceType"
+                  "Ref":"XserverInstanceType"
                 },
                 "Arch"
               ]
@@ -3577,7 +3623,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"XserverInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -4040,7 +4086,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"WorkerInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -4289,7 +4335,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"ForumInstanceType"
         },
         "BlockDeviceMappings":[
           {
@@ -4664,7 +4710,7 @@
           "Ref":"KeyName"
         },
         "InstanceType":{
-          "Ref":"InstanceType"
+          "Ref":"MongoInstanceType"
         },
         "BlockDeviceMappings":[
           {