Merge pull request #3295 from edx/bbeggs/prefix

prefix keys and instances with the same text

playbooks/continuous_delivery/launch_instance.yml

@@ -30,7 +30,8 @@
     ebs_volume_size: 8
     ec2_timeout: 500
     ec2_assign_public_ip: no
-  gather_facts: False
+    automtion_prefix: "gocd automation run -- {{ ansible_date_time.iso8601 }} -- "
+  gather_facts: True
   connection: local
   tasks:
 
@@ -40,7 +41,7 @@
 
   - name: Generate ec2 keypair to use for this instance
     ec2_key:
-      name: "{{ unique_key_name.stdout }}"
+      name: "{{ automtion_prefix }} {{ unique_key_name.stdout }}"
       region: "{{ ec2_region }}"
     register: ssh_key_register
 
@@ -52,7 +53,7 @@
 
   - name: Launch EC2 instance
     ec2:
-      instance_tags: {"Name" : "gocd automation run -- {{ unique_key_name.stdout }}"}
+      instance_tags: {"Name" : "{{ automtion_prefix }} {{ unique_key_name.stdout }}"}
       region: "{{ ec2_region }}"
       key_name: "{{ unique_key_name.stdout }}"
       instance_type: "{{ ec2_instance_type }}"