support overlay IP

DrGonzo65 · Oct 24, 2013 · e1c6734 · e1c6734
1 parent 43f7938
commit e1c6734
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bin/ec2who b/bin/ec2who
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/Users/nshortway/pyenv/bin/python
 
 import argparse
 import sys
@@ -19,6 +19,8 @@ def get_instances_for_query(ec2_conn, query):
     if re.match(r"^[\d.]+", args.query):
         if re.match(r"^10\.", args.query):
             filters["private-ip-address"] = args.query
+        elif re.match(r"^192\.", args.query):
+            filters["tag:overlay_ip"] = args.query
         else:
             filters["ip-address"] = args.query
 
@@ -53,7 +55,8 @@ def print_instance_info(instance):
         instance.id,
         instance.placement,
         instance.private_ip_address,
-        public_interface.strip()])
+        public_interface.strip(),
+        instance.tags.get("overlay_ip", "(None)")])
 
 
 if __name__ == "__main__":

diff --git a/setup.py b/setup.py
@@ -86,7 +86,7 @@
 
 setup(
     name = "ec2-cli-tools",
-    version = "1.5",
+    version = "1.5.1",
     author = "Shayne Sweeney & Tyler Smalley & Mike Krieger & Nick Shortway",
     author_email = "team@flippath.com",
     description = "Helpful CLI utilities for querying and connecting to EC2 instances",