Browse Source

remove re-auth logic for ironic client

We are using keystone session to build ironic client now, keystone
session support to re-auth for expired token, so we don't need to
re-auth again in client wrapper. This logic is removed from nova
in Ifbb6e19d4e2811ebaafc4e5899e46b13b4520f62.

Change-Id: Id319a01c8745b466aaf77b9087ffb2f3fd1e5533
changes/12/537812/1
yufei 1 year ago
parent
commit
dd7567d50a
1 changed files with 5 additions and 22 deletions
  1. 5
    22
      mogan/common/ironic.py

+ 5
- 22
mogan/common/ironic.py View File

@@ -37,10 +37,6 @@ class IronicClientWrapper(object):
37 37
         """Initialise the IronicClientWrapper for use."""
38 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 40
     def _get_auth_plugin(self):
45 41
         """Load an auth plugin from CONF options."""
46 42
         # If an auth plugin name is defined in `auth_type` option of [ironic]
@@ -115,21 +111,8 @@ class IronicClientWrapper(object):
115 111
         """
116 112
         retry_on_conflict = kwargs.pop('retry_on_conflict', True)
117 113
 
118
-        # NOTE(dtantsur): allow for authentication retry, other retries are
119
-        # handled by ironicclient starting with 0.8.0
120
-        for attempt in range(2):
121
-            client = self._get_client(retry_on_conflict=retry_on_conflict)
122
-
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
114
+        # authentication retry for token expiration is handled in keystone
115
+        # session, other retries are handled by ironicclient starting with
116
+        # 0.8.0
117
+        client = self._get_client(retry_on_conflict=retry_on_conflict)
118
+        return self._multi_getattr(client, method)(*args, **kwargs)

Loading…
Cancel
Save