no need to pass timeout

lib/ansible/cli/config.py

@@ -149,9 +149,9 @@ class ConfigCLI(CLI):
 
         super(ConfigCLI, self).run()
 
-        # initialize galaxy server options
-        self._galaxy_servers = [s for s in C.GALAXY_SERVER_LIST or [] if s]  # clean list
-        C.config.load_galaxy_server_defs(self._galaxy_servers, C.GALAXY_SERVER_TIMEOUT)
+        # initialize each galaxy server's options from known listed servers
+        self._galaxy_servers = [s for s in C.GALAXY_SERVER_LIST or [] if s]  # clean list, reused later here
+        C.config.load_galaxy_server_defs(self._galaxy_servers)
 
         if context.CLIARGS['config_file']:
             self.config_file = unfrackpath(context.CLIARGS['config_file'], follow=False)

lib/ansible/cli/galaxy.py

@@ -596,7 +596,8 @@ class GalaxyCLI(CLI):
 
         self.galaxy = Galaxy()
 
-        C.config.load_galaxy_server_defs(C.GALAXY_SERVER_LIST, C.GALAXY_SERVER_TIMEOUT)
+        # dynamically add per server config depending on declared servers
+        C.config.load_galaxy_server_defs(C.GALAXY_SERVER_LIST)
 
         galaxy_options = {}
         for optional_key in ['clear_response_cache', 'no_cache']:

lib/ansible/config/manager.py

@@ -322,7 +322,7 @@ class ConfigManager(object):
         # ensure we always have config def entry
         self._base_defs['CONFIG_FILE'] = {'default': None, 'type': 'path'}
 
-    def load_galaxy_server_defs(self, server_list, default_timeout):
+    def load_galaxy_server_defs(self, server_list):
 
         def server_config_def(section, key, required, option_type):
             config_def = {
@@ -341,9 +341,9 @@ class ConfigManager(object):
             }
             if key in GALAXY_SERVER_ADDITIONAL:
                 config_def.update(GALAXY_SERVER_ADDITIONAL[key])
-                # handle default timeout by inheriting from passed in default_timeout
+                # ensure we always have a default timeout
                 if key == 'timeout' and 'default' not in config_def:
-                    config_def['default'] = default_timeout
+                    config_def['default'] = self.get_config_value('GALAXY_TIMEOUT')
 
             return config_def