Merge "Add support for token caching"

Zuul · openstack-gerrit · commit 782e4d0f975d · 2021-04-09T23:29:03.000Z
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
@@ -83,10 +83,12 @@ def setup_auth(self):
             self._cli_options._openstack_config._pw_callback = \
                 shell.prompt_for_password
             try:
-                self._cli_options._auth = \
-                    self._cli_options._openstack_config.load_auth_plugin(
-                        self._cli_options.config,
-                    )
+                # We might already get auth from SDK caching
+                if not self._cli_options._auth:
+                    self._cli_options._auth = \
+                        self._cli_options._openstack_config.load_auth_plugin(
+                            self._cli_options.config,
+                        )
             except TypeError as e:
                 self._fallback_load_auth_plugin(e)
 
