Enable standalone Octavia for testing

neutron-lbass project is deprecated as of the Queens. And will go away
in T or U release. (https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation)

Adding new scenario "octaviav2" to test standalone Octavia deployment
without neutron integration.

Change-Id: I941a47d0a963d42150c56676c5a60a1accf64bc4
This commit is contained in:
Vadim Kuznetsov 2019-04-18 16:10:18 -04:00
parent 8492e93c1f
commit bf691ea4e5
2 changed files with 15 additions and 2 deletions

View File

@ -222,8 +222,17 @@ openstack_user_kernel_options:
- key: 'kernel.printk' - key: 'kernel.printk'
value: '4 1 7 4' value: '4 1 7 4'
{% if 'octavia' in bootstrap_host_services %} {% if 'octaviav2' in bootstrap_host_scenario %}
# Octavia specific stuff # Disable Octavia support in Neutron
neutron_lbaas_octavia: False
# Disable LBaaS V2
neutron_lbaasv2: False
# 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_services %}
neutron_lbaas_octavia: True neutron_lbaas_octavia: True
octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}" octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}"
{% endif %} {% endif %}

View File

@ -19,6 +19,7 @@ bootstrap_host_special_word_list:
- lxc - lxc
- metal - metal
- nspawn - nspawn
- octaviav2
- proxy - proxy
- source - source
- telemetry - telemetry
@ -40,6 +41,9 @@ bootstrap_host_services: >-
{%- if 'ironic' in scenario_list %} {%- if 'ironic' in scenario_list %}
{%- set _ = service_list.extend(['swift']) %} {%- set _ = service_list.extend(['swift']) %}
{%- endif %} {%- endif %}
{%- if 'octaviav2' in scenario_list %}
{%- set _ = service_list.extend(['octavia']) %}
{%- endif %}
{%- if 'telemetry' in scenario_list %} {%- if 'telemetry' in scenario_list %}
{%- set _ = service_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %} {%- set _ = service_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %}
{%- endif %} {%- endif %}