summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-04-09 23:29:03 +0000
committerGerrit Code Review <review@openstack.org>2021-04-09 23:29:03 +0000
commit782e4d0f975d93e6132f871fa29644c5871e2eaf (patch)
tree8982bb45a5aa23be70281e0331f18c854429eb3b /openstackclient/common
parent684be67df9be010736132ca2565777b04ed0ca1e (diff)
parent30d5f14a700dd53d80e0fbedefd9b1ad337390f9 (diff)
downloadpython-openstackclient-782e4d0f975d93e6132f871fa29644c5871e2eaf.tar.gz
Merge "Add support for token caching"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 36c3ce26..1ed6aa24 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -83,10 +83,12 @@ class ClientManager(clientmanager.ClientManager):
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)