From a280bbcb6db471e3275e4d3937404da6f09479b5 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Tue, 16 Dec 2014 15:17:39 -0500
Subject: [PATCH] Add tag metadata to the instances.

---
 buildman/manager/executor.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py
index e82ecf672..b35a90c97 100644
--- a/buildman/manager/executor.py
+++ b/buildman/manager/executor.py
@@ -118,7 +118,13 @@ class EC2Executor(BuilderExecutor):
     elif len(reservation.instances) != 1:
       raise ExecutorException('EC2 started wrong number of instances!')
 
-    return reservation.instances[0].id
+    launched = reservation.instances[0]
+    launched.add_tags({
+        'Name': 'Quay Ephemeral Builder',
+        'Realm': realm,
+        'Token': token,
+    })
+    return launched.id
 
   def stop_builder(self, builder_id):
     ec2_conn = self._get_conn()