add region suppoer for elbadmin

1 files changed, 13 insertions, 2 deletions

diff --git a/bin/elbadmin b/bin/elbadmin
index e0aaf9d9..87dd2b14 100755
--- a/bin/elbadmin
+++ b/bin/elbadmin
@@ -108,7 +108,11 @@ def get(elb, name):
         print
 
         # Make map of all instance Id's to Name tags
-        ec2 = boto.connect_ec2()
+        if not options.region:
+            ec2 = boto.connect_ec2()
+        else:
+            import boto.ec2.elb
+            ec2 = boto.ec2.connect_to_region(options.region)
 
         instance_health = b.get_instance_health()
         instances = [state.instance_id for state in instance_health]
@@ -236,6 +240,9 @@ if __name__ == "__main__":
     parser.add_option("-l", "--listener",
                       help="Specify Listener in,out,proto",
                       action="append", default=[], dest="listeners")
+    parser.add_option("-r", "--region",
+                      help="Region to connect to",
+                      action="store", dest="region")
 
     (options, args) = parser.parse_args()
 
@@ -243,7 +250,11 @@ if __name__ == "__main__":
         parser.print_help()
         sys.exit(1)
 
-    elb = boto.connect_elb()
+    if not options.region:
+        elb = boto.connect_elb()
+    else:
+        import boto.ec2.elb
+        elb = boto.ec2.elb.connect_to_region(options.region)
 
     print "%s" % (elb.region.endpoint)