Merge pull request #715 from edx/jarv/role-to-play

changing role to play

cloudformation_templates/edx-admin-reference-architecture.json

@@ -672,7 +672,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"bastion"
           },
           {
@@ -799,7 +799,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"admin"
           },
           {

cloudformation_templates/edx-reference-architecture.json

@@ -2623,7 +2623,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"bastion"
           },
           {
@@ -3034,7 +3034,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"edxapp",
             "PropagateAtLaunch":true
           },
@@ -3385,7 +3385,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"xqueue",
             "PropagateAtLaunch":true
           },
@@ -3719,7 +3719,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"rabbitmq",
             "PropagateAtLaunch":true
           },
@@ -4089,7 +4089,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"xserver",
             "PropagateAtLaunch":true
           },
@@ -4396,7 +4396,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"rds"
           },
           {
@@ -4552,7 +4552,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"worker",
             "PropagateAtLaunch":true
           },
@@ -4801,7 +4801,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"elasticsearch",
             "PropagateAtLaunch":true
           },
@@ -5062,7 +5062,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"forum",
             "PropagateAtLaunch":true
           },
@@ -5452,7 +5452,7 @@
         ],
         "Tags":[
           {
-            "Key":"role",
+            "Key":"play",
             "Value":"mongo",
             "PropagateAtLaunch":true
           },

util/vpc-tools/vpc-tools.py

@@ -84,7 +84,10 @@ def _ssh_config(args):
     for reservation in reservations:
         for instance in reservation.instances:
 
-            if 'role' in instance.tags:
+            if 'play' in instance.tags:
+                logical_id = instance.tags['play']
+            elif 'role' in instance.tags:
+                # deprecated, use "play" instead
                 logical_id = instance.tags['role']
             elif 'group' in instance.tags:
                 logical_id = instance.tags['group']