Merge pull request #799 from edx/feanil/cfn_add_deployment

Add deployment to the cloudformation name.

cloudformation_templates/edx-reference-architecture.json

@@ -3073,7 +3073,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"edxapp"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"edxapp"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -3396,7 +3396,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"xqueue"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"xqueue"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -3714,7 +3714,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"commoncluster"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"commoncluster"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -4277,7 +4277,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"xserver"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"xserver"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -4706,7 +4706,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"worker"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"worker"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -4923,7 +4923,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"forum"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"forum"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -5323,7 +5323,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"mongo"]]},
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"mongo"]]},
             "PropagateAtLaunch":true
           },
           {
@@ -5645,7 +5645,7 @@
         "Tags":[
           {
             "Key":"Name",
-            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},"notifier"]]}
+            "Value": {"Fn::Join": ["-",[{"Ref": "EnvironmentTag"},{"Ref": "DeploymentTag"},"notifier"]]}
           },
           {
             "Key":"play",