[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 39609f5666249cb14745c26011497a3b76624b43
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri May 31 23:04:10 2013 -0600

    Make euca-* check config for timeout length
    
    Fixes TOOLS-344 for commands that begin with euca-*

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 46b4600..a1d6839 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -178,13 +178,19 @@ class Eucalyptus(BaseService):
                 if self.URL_ENVVAR in config:
                     self.process_url(config[self.URL_ENVVAR])
 
-        # Set timeout and retry handlers
+        # Configure request timeouts and retry handlers
         if self.max_retries is None:
             config_max_retries = self.config.get_global_option('max-retries')
             if config_max_retries is not None:
                 self.max_retries = int(config_max_retries)
             else:
                 self.max_retries = self.MAX_RETRIES
+        if self.timeout is None:
+            config_timeout = self.config.get_global_option('timeout')
+            if config_timeout is not None:
+                self.timeout = float(config_timeout)
+            else:
+                self.timeout = self.TIMEOUT
 
         # SSL cert verification is opt-in
         self.session_args['verify'] = self.config.get_region_option_bool(

-- 
managing cloud instances for Eucalyptus