[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 11fdba972c4a94a42d1b50d121c35da21fdff807
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Apr 12 17:04:22 2013 -0700

    Allow current user/region setting with EUCA_REGION

diff --git a/euca2ools/commands/autoscaling/__init__.py b/euca2ools/commands/autoscaling/__init__.py
index cbaddfc..a683254 100644
--- a/euca2ools/commands/autoscaling/__init__.py
+++ b/euca2ools/commands/autoscaling/__init__.py
@@ -41,6 +41,7 @@ class AutoScaling(requestbuilder.service.BaseService):
     DESCRIPTION = 'Auto-scaling service'
     API_VERSION = '2011-01-01'
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'AWS_AUTO_SCALING_URL'
 
     ARGS = [MutuallyExclusiveArgList(
diff --git a/euca2ools/commands/elasticloadbalancing/__init__.py b/euca2ools/commands/elasticloadbalancing/__init__.py
index b1b256f..62107e1 100644
--- a/euca2ools/commands/elasticloadbalancing/__init__.py
+++ b/euca2ools/commands/elasticloadbalancing/__init__.py
@@ -41,6 +41,7 @@ class ELB(requestbuilder.service.BaseService):
     DESCRIPTION = 'Load balancing service'
     API_VERSION = '2012-06-01'
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'AWS_ELB_URL'
 
     ARGS = [MutuallyExclusiveArgList(
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index d9fd98f..76cd953 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -43,6 +43,7 @@ class Euare(requestbuilder.service.BaseService):
     DESCRIPTION = 'Eucalyptus User, Authorization and Reporting Environment'
     API_VERSION = '2010-05-08'
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'EUARE_URL'
 
     ARGS = [MutuallyExclusiveArgList(
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index f22c79a..b12aac8 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -138,6 +138,7 @@ class Eucalyptus(requestbuilder.service.BaseService):
     DESCRIPTION = 'Eucalyptus compute cloud service'
     API_VERSION = '2013-02-01'
     AUTH_CLASS  = EC2CompatibleQuerySigV2Auth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'EC2_URL'
 
     ARGS = [Arg('--config', dest='shell_configfile', metavar='CFGFILE',
@@ -165,6 +166,8 @@ class Eucalyptus(requestbuilder.service.BaseService):
             if self.URL_ENVVAR in config:
                 self.process_url(config[self.URL_ENVVAR])
         # Environment
+        if self.REGION_ENVVAR in os.environ:
+            self.process_userregion(os.getenv(self.REGION_ENVVAR))
         self.process_url(os.getenv(self.URL_ENVVAR))
         # Regular config file
         self.process_url(self.config.get_region_option(self.NAME + '-url'))
diff --git a/euca2ools/commands/monitoring/__init__.py b/euca2ools/commands/monitoring/__init__.py
index 820d873..2c5aa7b 100644
--- a/euca2ools/commands/monitoring/__init__.py
+++ b/euca2ools/commands/monitoring/__init__.py
@@ -41,6 +41,7 @@ class CloudWatch(requestbuilder.service.BaseService):
     DESCRIPTION = 'Instance monitoring service'
     API_VERSION = '2010-08-01'
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'AWS_CLOUDWATCH_URL'
 
     ARGS = [MutuallyExclusiveArgList(
diff --git a/euca2ools/commands/walrus/__init__.py b/euca2ools/commands/walrus/__init__.py
index 1a3d037..adceaa0 100644
--- a/euca2ools/commands/walrus/__init__.py
+++ b/euca2ools/commands/walrus/__init__.py
@@ -43,6 +43,7 @@ class Walrus(requestbuilder.service.BaseService):
     NAME = 's3'
     DESCRIPTION = 'Object storage service'
     AUTH_CLASS = requestbuilder.auth.S3RestAuth
+    REGION_ENVVAR = 'EUCA_REGION'
     URL_ENVVAR = 'S3_URL'
 
     ARGS = [MutuallyExclusiveArgList(

-- 
managing cloud instances for Eucalyptus