Change default settings for Octavia on QEMU
Change-Id: Ibb7ab090a5c8f72cbd167c6c388929f3a5740240
This commit is contained in:
parent
c9dcf15b34
commit
24fe19861f
|
@ -16,6 +16,7 @@
|
|||
from tempest.lib import exceptions
|
||||
from tempest.lib.services.compute import flavors_client
|
||||
from tempest.lib.services.compute import hosts_client
|
||||
from tempest.lib.services.compute import hypervisor_client
|
||||
from tempest.lib.services.compute import servers_client
|
||||
from tempest.lib.services.identity.v2 import identity_client
|
||||
from tempest.lib.services.identity.v2 import roles_client
|
||||
|
@ -120,6 +121,12 @@ class ClientManager(object):
|
|||
self.identity_region,
|
||||
**default_params)
|
||||
|
||||
self.hypervisor_client = hypervisor_client.HypervisorClient(
|
||||
self.auth_provider,
|
||||
conf.get_defaulted('compute', 'catalog_type'),
|
||||
self.identity_region,
|
||||
**default_params)
|
||||
|
||||
self.accounts = account_client.AccountClient(
|
||||
self.auth_provider,
|
||||
conf.get_defaulted('object-storage', 'catalog_type'),
|
||||
|
@ -219,7 +226,7 @@ class ClientManager(object):
|
|||
# and so on.
|
||||
if service_name == "image":
|
||||
return self.images
|
||||
elif service_name in ["network", "object-store"]:
|
||||
elif service_name in ["network", "object-store", "load-balancer"]:
|
||||
# return whole ClientManager object because NetworkService
|
||||
# currently needs to have an access to get_neutron/nova_client
|
||||
# methods which are chosen according to neutron presence
|
||||
|
|
|
@ -27,6 +27,19 @@ class LoadBalancerService(VersionedService):
|
|||
conf.set('load_balancer', 'RBAC_test_type', 'owner_or_admin')
|
||||
conf.set('network-feature-enabled', 'port_security', 'True')
|
||||
|
||||
client = self.client.hypervisor_client
|
||||
hypervisors = [
|
||||
client.show_hypervisor(h['id'])['hypervisor']
|
||||
for h in client.list_hypervisors()['hypervisors']]
|
||||
has_qemu = [
|
||||
True
|
||||
for h in hypervisors
|
||||
if h['hypervisor_type'] == 'QEMU']
|
||||
if has_qemu:
|
||||
# The default value for lb_build_timeout is 900, but this value is
|
||||
# too low on some really slow hosts (non-nested virt).
|
||||
conf.set('load_balancer', 'lb_build_timeout', '1200')
|
||||
|
||||
@staticmethod
|
||||
def get_service_type():
|
||||
return ['load-balancer']
|
||||
|
|
Loading…
Reference in New Issue