Merge "Revert "Split auth plugin loading into its own method""

1 files changed, 15 insertions, 19 deletions

diff --git a/os_client_config/config.py b/os_client_config/config.py
index 01f659e..5ab0d90 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -1035,24 +1035,6 @@ class OpenStackConfig(object):
 
         return config
 
-    def load_auth_plugin(self, config, cloud):
-        try:
-            loader = self._get_auth_loader(config)
-            config = self._validate_auth(config, loader)
-            auth_plugin = loader.load_from_options(**config['auth'])
-        except Exception as e:
-            # We WANT the ksa exception normally
-            # but OSC can't handle it right now, so we try deferring
-            # to ksc. If that ALSO fails, it means there is likely
-            # a deeper issue, so we assume the ksa error was correct
-            self.log.debug("Deferring keystone exception: {e}".format(e=e))
-            auth_plugin = None
-            try:
-                config = self._validate_auth_ksc(config, cloud)
-            except Exception:
-                raise e
-        return auth_plugin
-
     def get_one_cloud(self, cloud=None, validate=True,
                       argparse=None, **kwargs):
         """Retrieve a single cloud configuration and merge additional options
@@ -1111,7 +1093,21 @@ class OpenStackConfig(object):
         config = self.auth_config_hook(config)
 
         if validate:
-            auth_plugin = self.load_auth_plugin(config, cloud)
+            try:
+                loader = self._get_auth_loader(config)
+                config = self._validate_auth(config, loader)
+                auth_plugin = loader.load_from_options(**config['auth'])
+            except Exception as e:
+                # We WANT the ksa exception normally
+                # but OSC can't handle it right now, so we try deferring
+                # to ksc. If that ALSO fails, it means there is likely
+                # a deeper issue, so we assume the ksa error was correct
+                self.log.debug("Deferring keystone exception: {e}".format(e=e))
+                auth_plugin = None
+                try:
+                    config = self._validate_auth_ksc(config, cloud)
+                except Exception:
+                    raise e
         else:
             auth_plugin = None