From 0c6b7308e7b905a003b2738aa6f6b9a757b548a9 Mon Sep 17 00:00:00 2001 From: Oscar Date: Sun, 3 Mar 2013 12:00:03 -0800 Subject: [PATCH 1/2] add support for VPC hosts --- bin/ec2-host | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/ec2-host b/bin/ec2-host index f1637b0..a274a9a 100755 --- a/bin/ec2-host +++ b/bin/ec2-host @@ -43,6 +43,9 @@ def ec2_active_instances(label_tag, filters): if instance.public_dns_name: pair = (instance_name, instance.public_dns_name) instances.append(pair) + elif instance.vpc_id and instance.private_ip_address: + pair = (instance_name, instance.private_ip_address) + instances.append(pair) return instances From 05a3b682c71f246c80b043382533a0c0badb6e27 Mon Sep 17 00:00:00 2001 From: Oscar Date: Sun, 3 Mar 2013 12:57:47 -0800 Subject: [PATCH 2/2] make us-west-2 region default --- bin/ec2-host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ec2-host b/bin/ec2-host index a274a9a..0fbef63 100755 --- a/bin/ec2-host +++ b/bin/ec2-host @@ -60,7 +60,7 @@ def main(argv): aws_key = os.environ.get("AWS_ACCESS_KEY_ID") aws_secret = os.environ.get("AWS_SECRET_ACCESS_KEY") - region = os.environ.get("AWS_EC2_REGION") + region = os.environ.get("AWS_EC2_REGION", "us-west-2") tag = "Name" for opt, arg in opts: