summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nova/network/neutron.py1
-rw-r--r--nova/tests/unit/network/test_neutron.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/nova/network/neutron.py b/nova/network/neutron.py
index 745d522f8c..4c882e7f96 100644
--- a/nova/network/neutron.py
+++ b/nova/network/neutron.py
@@ -273,6 +273,7 @@ def _get_ksa_client(context, admin=False):
client = utils.get_ksa_adapter(
'network', ksa_auth=auth_plugin, ksa_session=session)
client.additional_headers = {'accept': 'application/json'}
+ client.connect_retries = CONF.neutron.http_retries
return client
diff --git a/nova/tests/unit/network/test_neutron.py b/nova/tests/unit/network/test_neutron.py
index 3e6dc6417b..5d7c2069eb 100644
--- a/nova/tests/unit/network/test_neutron.py
+++ b/nova/tests/unit/network/test_neutron.py
@@ -253,6 +253,8 @@ class TestNeutronClient(test.NoDBTestCase):
auth_token='token')
cl = neutronapi.get_client(my_context)
self.assertEqual(retries, cl.httpclient.connect_retries)
+ kcl = neutronapi._get_ksa_client(my_context)
+ self.assertEqual(retries, kcl.connect_retries)
class TestAPIBase(test.TestCase):