openstack/openstack-ansible
Code Issues Proposed changes

Merge "Drop octaviav2 specific scenarios"

Browse Source
This commit is contained in:
Zuul 2019-09-30 18:43:29 +00:00 committed by Gerrit Code Review
commit 16debdf84e
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 %}