openstack/openstack-ansible
Code Issues Proposed changes

Drop octaviav2 specific scenarios

Browse Source 
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
This commit is contained in:
Dmitriy Rabotyagov 2019-09-20 20:02:21 +03:00
parent 0d6bc06e49
commit d1b8c6d811
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -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') %}

3
tests/roles/bootstrap-host/vars/main.yml
View File

@ -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 %}