Merge "Enable overcommit_memory in test server VMs"
diff --git a/octavia_tempest_plugin/config.py b/octavia_tempest_plugin/config.py
index 46365f1..7c4ed2f 100644
--- a/octavia_tempest_plugin/config.py
+++ b/octavia_tempest_plugin/config.py
@@ -102,12 +102,13 @@
'default RBAC tests. "owner_or_admin" runs the legacy '
'owner or admin tests. "none" disables the RBAC tests.'),
cfg.DictOpt('enabled_provider_drivers',
- help=('List of enabled provider drivers and description '
- 'dictionaries. Must match the driver name in the '
+ help=('A comma separated list of dictionaries of the '
+ 'enabled provider driver names and descriptions. '
+ 'Must match the driver name in the '
'octavia.api.drivers entrypoint. Example: '
- '{\'amphora\': \'The Octavia Amphora driver.\', '
- '\'octavia\': \'Deprecated alias of the Octavia '
- 'Amphora driver.\'}'),
+ 'amphora:The Octavia Amphora driver.,'
+ 'octavia:Deprecated alias of the Octavia '
+ 'Amphora driver.'),
default={'amphora': 'The Octavia Amphora driver.',
'octavia': 'Deprecated alias of the Octavia Amphora '
'driver.'}),
diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py
index 1633685..0e8a909 100644
--- a/octavia_tempest_plugin/tests/test_base.py
+++ b/octavia_tempest_plugin/tests/test_base.py
@@ -311,10 +311,10 @@
name='ipv6-private-subnet')['subnets']
cls.lb_member_vip_ipv6_subnet_stateful = False
- if (priv_ipv6_subnet[0]['ipv6_address_mode'] ==
- 'dhcpv6-stateful'):
- cls.lb_member_vip_ipv6_subnet_stateful = True
if len(priv_ipv6_subnet) == 1:
+ if (priv_ipv6_subnet[0]['ipv6_address_mode'] ==
+ 'dhcpv6-stateful'):
+ cls.lb_member_vip_ipv6_subnet_stateful = True
cls.lb_member_vip_ipv6_subnet = priv_ipv6_subnet[0]
cls.lb_member_vip_ipv6_net = {
'id': priv_ipv6_subnet[0]['network_id']}
@@ -333,6 +333,7 @@
cls._logging_delete_subnet,
cls.lb_mem_subnet_client.show_subnet,
cls.lb_member_vip_ipv6_subnet['id'])
+
LOG.info('lb_member_vip_ipv6_subnet: {}'.format(
cls.lb_member_vip_ipv6_subnet))
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d342aff..42643ed 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -97,10 +97,15 @@
$OCTAVIA_CONF:
haproxy_amphora:
# Set these higher for non-nested virt nodepool instances
- connection_max_retries: 300
+ connection_max_retries: 1200
build_active_retries: 300
amphora_agent:
forward_all_logs: True
+ test-config:
+ "$TEMPEST_CONFIG":
+ load_balancer:
+ check_interval: 1
+ check_timeout: 180
devstack_services:
neutron-qos: true
devstack_plugins:
@@ -425,12 +430,6 @@
OCTAVIA_AMP_BASE_OS: centos
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
OCTAVIA_AMP_IMAGE_SIZE: 3
- devstack_local_conf:
- post-config:
- $OCTAVIA_CONF:
- haproxy_amphora:
- # Set these higher for non-nested virt nodepool instances
- connection_max_retries: 480
- job:
name: octavia-v2-dsvm-scenario-ubuntu-bionic
@@ -584,11 +583,6 @@
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
OCTAVIA_AMP_IMAGE_SIZE: 3
devstack_local_conf:
- post-config:
- $OCTAVIA_CONF:
- haproxy_amphora:
- # Set these higher for non-nested virt nodepool instances
- connection_max_retries: 480
test-config:
"$TEMPEST_CONFIG":
load_balancer: