Merge "Revert "Add timeout and retries to JSON RPC client"" into stable/train

ironic/common/json_rpc/client.py

@@ -41,14 +41,11 @@ def _get_session():
         else:
             auth = None
 
-        session = keystone.get_session('json_rpc', auth=auth)
-        session.headers = {
+        _SESSION = keystone.get_session('json_rpc', auth=auth)
+        _SESSION.headers = {
             'Content-Type': 'application/json'
         }
 
-        # Adds options like connect_retries
-        _SESSION = keystone.get_adapter('json_rpc', session=session)
-
     return _SESSION
 
 

ironic/conf/json_rpc.py

@@ -38,8 +38,6 @@ opts = [
 def register_opts(conf):
     conf.register_opts(opts, group='json_rpc')
     auth.register_auth_opts(conf, 'json_rpc')
-    conf.set_default('timeout', 15, group='json_rpc')
-    conf.set_default('connect_retries', 2, group='json_rpc')
 
 
 def list_opts():

releasenotes/notes/json-rpc-timeout-ac30eea164b3a294.yaml

@@ -1,7 +0,0 @@
----
-fixes:
-  - |
-    Fixes the JSON RPC backend potentially hanging on inability to connect
-    to a conductor. The default timeout is now 15 seconds and 2 retries are
-    made. These values can be adjusted via the configuration options
-    ``[json_rpc]timeout`` and ``[json_rpc]connect_retries`` accordingly.