[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:01 UTC 2013


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

    Use new method for multi-route arg distribution

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 37c54fb..f22c79a 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -141,7 +141,7 @@ class Eucalyptus(requestbuilder.service.BaseService):
     URL_ENVVAR = 'EC2_URL'
 
     ARGS = [Arg('--config', dest='shell_configfile', metavar='CFGFILE',
-                 default='', route_to=SERVICE, help=argparse.SUPPRESS),
+                 default='', route_to=(SERVICE, AUTH), help=argparse.SUPPRESS),
             MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
                     route_to=SERVICE, help='''name of the region and/or user
@@ -181,10 +181,6 @@ class Eucalyptus(requestbuilder.service.BaseService):
         # Ensure everything is okay and finish up
         self.validate_config()
         if self.auth is not None:
-            # HACK:  this was an easy way to make a CLI-supplied shell-style
-            # config file name available to the auth handler.
-            # Remove this line in 3.2.
-            self.auth.args['shell_configfile'] = self.args['shell_configfile']
             self.auth.configure()
 
     def handle_http_error(self, response):

-- 
managing cloud instances for Eucalyptus



More information about the pkg-eucalyptus-commits mailing list