Merge changes I1f986a06,I8e5f8c51 into mcp/epoxy
* changes:
Use dns.build_timeout for DNS client
Increase the default DNS timeout to 60 seconds to prevent sporadic TimeoutException errors.
diff --git a/neutron_tempest_plugin/scenario/test_dns_integration.py b/neutron_tempest_plugin/scenario/test_dns_integration.py
index df9406f..e349a97 100644
--- a/neutron_tempest_plugin/scenario/test_dns_integration.py
+++ b/neutron_tempest_plugin/scenario/test_dns_integration.py
@@ -66,7 +66,7 @@
def setup_clients(cls):
super(BaseDNSIntegrationTests, cls).setup_clients()
cls.dns_client = cls.os_tempest.dns_v2.ZonesClient()
- cls.query_client.build_timeout = 30
+ cls.query_client.build_timeout = CONF.dns.build_timeout
if CONF.enforce_scope.designate:
cls.admin_tld_client = cls.os_system_admin.dns_v2.TldClient()
cls.rec_client = cls.os_system_admin.dns_v2.RecordsetClient()