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

Garrett Holmstrom gholms at fedoraproject.org
Sun Jun 16 02:31:00 UTC 2013


The following commit has been merged in the master branch:
commit 28899ae73990c03637123332c53507c6d05dd75a
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Apr 12 16:45:35 2013 -0700

    Give --region priority over AWS_CREDENTIAL_FILE
    
    Fixes TOOLS-292

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 8f2e069..37c54fb 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -106,6 +106,8 @@ class EC2CompatibleQuerySigV2Auth(QuerySigV2Auth):
             self.args['key_id'] = os.getenv('EC2_ACCESS_KEY')
         if 'EC2_SECRET_KEY' in os.environ and not self.args.get('secret_key'):
             self.args['secret_key'] = os.getenv('EC2_SECRET_KEY')
+        # --region
+        self.configure_from_configfile(only_if_explicit=True)
         # AWS credential file (location given in the environment)
         self.configure_from_aws_credential_file()
         # Regular config file

-- 
managing cloud instances for Eucalyptus



More information about the pkg-eucalyptus-commits mailing list