Update instance tags to match new scheme.

cloudformation_templates/edx-reference-architecture.json

@@ -4,8 +4,13 @@
   "Parameters":{
     "EnvironmentTag":{
       "Type":"String",
-      "Description":"A tag value applied to the hosts in the VPC indicating which environment to use during the configuration phase, e.g., dev, stage, prod",
-      "Default":"stage"
+      "Description":"A tag value applied to the hosts in the VPC indicating which environment to use during the configuration phase, e.g., stage, prod, sandbox",
+      "Default":"sandbox"
+    },
+    "DeploymentTag":{
+      "Type":"String",
+      "Description":"A tag value applied to the hosts in the VPC indicating which deployment this is, e.g., edx, edge, <university>, <org>",
+      "Default":"edx"
     },
     "KeyName":{
       "Type":"String",
@@ -2040,7 +2045,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"bastion"
           },
           {
@@ -2049,6 +2054,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "UserData": { "Fn::Base64" : { "Fn::Join" : ["", [
@@ -2535,7 +2547,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"edxapp",
             "PropagateAtLaunch":true
           },
@@ -2545,6 +2557,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -2930,7 +2949,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"xqueue",
             "PropagateAtLaunch":true
           },
@@ -2940,6 +2959,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -3312,7 +3338,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"rabbitmq",
             "PropagateAtLaunch":true
           },
@@ -3322,6 +3348,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -3728,7 +3761,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"xserver",
             "PropagateAtLaunch":true
           },
@@ -3738,6 +3771,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -4201,7 +4241,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"worker",
             "PropagateAtLaunch":true
           },
@@ -4211,6 +4251,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -4595,7 +4642,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"forum",
             "PropagateAtLaunch":true
           },
@@ -4605,6 +4652,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{
@@ -5041,7 +5095,7 @@
         ],
         "Tags":[
           {
-            "Key":"group",
+            "Key":"role",
             "Value":"mongo",
             "PropagateAtLaunch":true
           },
@@ -5051,6 +5105,13 @@
               "Ref":"EnvironmentTag"
             },
             "PropagateAtLaunch":true
+          },
+          {
+            "Key":"deployment",
+            "Value":{
+              "Ref":"DeploymentTag"
+            },
+            "PropagateAtLaunch":true
           }
         ],
         "LaunchConfigurationName":{