Merge pull request #3 from mikeyk/master

domUUUU
DrGonzo65 · Apr 25, 2012 · 2088c94 · 2088c94
2 parents 3894796 + 28d7ed6
commit 2088c94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/bin/ec2who b/bin/ec2who
@@ -23,16 +23,16 @@ def get_instances_for_query(ec2_conn, query):
             filters["ip-address"] = args.query
 
     # dns
-    if re.match(r"^(ip|ec2)-", args.query):
+    if re.match(r"^(ip|ec2|domU)-", args.query):
         dns = args.query
 
-        pairs = [("ec2", ".compute-1.amazonaws.com"), ("ip", ".ec2.internal")]
+        pairs = [("ec2", ".compute-1.amazonaws.com"), ("ip", ".ec2.internal"), ("domU", ".ec2.internal")]
         for sw, ew in pairs:
             if dns.startswith(sw) and not dns.endswith(ew):
                 dns += ".*"
                 break
 
-        key = "private-dns-name" if dns.startswith("ip") else "dns-name"
+        key = "private-dns-name" if (dns.startswith("ip") or dns.startswith("domU")) else "dns-name"
         filters[key] = dns
 
     # instance name

diff --git a/setup.py b/setup.py
@@ -73,8 +73,8 @@
 
 setup(
     name = "ec2-cli-tools",
-    version = "1.1",
-    author = "Shayne Sweeney & Tyler Smalley",
+    version = "1.2",
+    author = "Shayne Sweeney & Tyler Smalley & Mike Krieger",
     author_email = "team@flippath.com",
     description = "Helpful CLI utilities for querying and connecting to EC2 instances",
     long_description = __doc__,