Add cluster tag as a part of abbey.py

The new code in the pipeline looks for the 'cluster' tag not the 'play' tag.  Add both for now,
we are working on a full replacement for abbey.py so this is just a shim until we can get to that.

util/vpc-tools/abbey.py

@@ -238,6 +238,7 @@ configuration_private_version="{configuration_private_version}"
 environment="{environment}"
 deployment="{deployment}"
 play="{play}"
+cluster="{play}"
 config_secure={config_secure}
 git_repo_name="configuration"
 git_repo="https://github.com/edx/$git_repo_name"
@@ -547,6 +548,8 @@ def create_ami(instance_id, name, description):
                 time.sleep(AWS_API_WAIT_TIME)
                 img.add_tag("deployment", args.deployment)
                 time.sleep(AWS_API_WAIT_TIME)
+                img.add_tag("cluster", args.play)
+                time.sleep(AWS_API_WAIT_TIME)
                 img.add_tag("play", args.play)
                 time.sleep(AWS_API_WAIT_TIME)
                 conf_tag = "{} {}".format("http://github.com/edx/configuration", args.configuration_version)