summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-02-05 10:15:52 +0000
committerGerrit Code Review <review@openstack.org>2018-02-05 10:15:52 +0000
commit99261e46b9cc690169646e63ee59417367ca2c03 (patch)
treecec42c3eea56665754a3c10b32b9f750f53ec83f
parent34c2478ce4b29f79a713040ed8c8cfef4ec53c60 (diff)
parentdd7567d50aac1b6b070cc13d6f77036eb22d0c24 (diff)
Merge "remove re-auth logic for ironic client"
-rw-r--r--mogan/common/ironic.py27
1 files changed, 5 insertions, 22 deletions
diff --git a/mogan/common/ironic.py b/mogan/common/ironic.py
index 6c4705f..20cb5b7 100644
--- a/mogan/common/ironic.py
+++ b/mogan/common/ironic.py
@@ -37,10 +37,6 @@ class IronicClientWrapper(object):
37 """Initialise the IronicClientWrapper for use.""" 37 """Initialise the IronicClientWrapper for use."""
38 self._cached_client = None 38 self._cached_client = None
39 39
40 def _invalidate_cached_client(self):
41 """Tell the wrapper to invalidate the cached ironic-client."""
42 self._cached_client = None
43
44 def _get_auth_plugin(self): 40 def _get_auth_plugin(self):
45 """Load an auth plugin from CONF options.""" 41 """Load an auth plugin from CONF options."""
46 # If an auth plugin name is defined in `auth_type` option of [ironic] 42 # If an auth plugin name is defined in `auth_type` option of [ironic]
@@ -115,21 +111,8 @@ class IronicClientWrapper(object):
115 """ 111 """
116 retry_on_conflict = kwargs.pop('retry_on_conflict', True) 112 retry_on_conflict = kwargs.pop('retry_on_conflict', True)
117 113
118 # NOTE(dtantsur): allow for authentication retry, other retries are 114 # authentication retry for token expiration is handled in keystone
119 # handled by ironicclient starting with 0.8.0 115 # session, other retries are handled by ironicclient starting with
120 for attempt in range(2): 116 # 0.8.0
121 client = self._get_client(retry_on_conflict=retry_on_conflict) 117 client = self._get_client(retry_on_conflict=retry_on_conflict)
122 118 return self._multi_getattr(client, method)(*args, **kwargs)
123 try:
124 return self._multi_getattr(client, method)(*args, **kwargs)
125 except ironic_exc.Unauthorized:
126 # In this case, the authorization token of the cached
127 # ironic-client probably expired. So invalidate the cached
128 # client and the next try will start with a fresh one.
129 if not attempt:
130 self._invalidate_cached_client()
131 LOG.debug("The Ironic client became unauthorized. "
132 "Will attempt to reauthorize and try again.")
133 else:
134 # This code should be unreachable actually
135 raise