From d1b8c6d8119fb5f3081f420d269bcc68f8be6dde Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 20 Sep 2019 20:02:21 +0300 Subject: [PATCH] Drop octaviav2 specific scenarios Since octaviav1 is retired, we need to make sure, that we're running only octaviav2 scenarios and not v1. To simplify things let's assume that octavia was always only v2, and leave v1 to lbaas. Change-Id: I50efef1eed3feab8ab438d87e87e5d60ca64a913 --- .../roles/bootstrap-host/templates/user_variables.aio.yml.j2 | 5 ++--- tests/roles/bootstrap-host/vars/main.yml | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index 917d8e5203..ec58894363 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -238,14 +238,13 @@ openstack_user_kernel_options: - key: 'kernel.printk' value: '4 1 7 4' -{% if 'octaviav2' in bootstrap_host_scenario %} +{% if 'octavia' in bootstrap_host_scenario %} # Enable Octavia V2 API/standalone octavia_v2: True # Disable Octavia V1 API octavia_v1: False octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}" -{% elif 'octavia' in bootstrap_host_scenarios_expanded %} -octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}" +tempest_run_concurrency: 0 {% endif %} {% if bootstrap_host_scenario is search('proxy') %} diff --git a/tests/roles/bootstrap-host/vars/main.yml b/tests/roles/bootstrap-host/vars/main.yml index ab8beaa501..44d6fba0cf 100644 --- a/tests/roles/bootstrap-host/vars/main.yml +++ b/tests/roles/bootstrap-host/vars/main.yml @@ -38,9 +38,6 @@ bootstrap_host_scenarios_expanded: |- {% if 'ironic' in bootstrap_host_scenarios %} {% set _ = scenario_list.extend(['swift']) %} {% endif %} - {% if 'octaviav2' in bootstrap_host_scenarios %} - {% set _ = scenario_list.extend(['octavia']) %} - {% endif %} {% if 'telemetry' in bootstrap_host_scenarios %} {% set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %} {% endif %}